Attachment 8408496 Details for Bug 907396

[patch] Interdiff for the "Frame constructor changes for display:contents" patch

2014-03-18-interdiff-fctor (text/plain), 41.17 KB, created by Mats Palmgren (inactive)

(hide)

Description:

Filename:

MIME Type:

Creator: Mats Palmgren (inactive)

Size: 41.17 KB

patch

obsolete

>2c2
>< # Parent c0d7296f4590d3a5576d7eca76097c09c0f62e09
>---
>> # Parent b01286b4ed370adcb5a26cf462fe055f1a5a826b
>9c9,13
>< @@ -2747,9 +2747,40 @@ RestyleManager::ComputeStyleChangeFor(ns
>---
>> @@ -2930,9 +2930,41 @@ RestyleManager::ComputeStyleChangeFor(ns
>>          NS_ASSERTION(!cont->GetPrevContinuation(),
>>                       "continuing frame had more severe impact than first-in-flow");
>>          return;
>>        }
>11,15c15
><  
><      frame2 = static_cast<nsIFrame*>
><        (propTable->Get(frame2, nsIFrame::IBSplitSpecialSibling()));
><      frame = frame2;
><    } while (frame2);
>---
>>    }
>38a39
>> +
>45c46
>< +    mTreeMatchContext.PushStyleScope(mAncestors[i]);
>---
>> +    mTreeMatchContext.PopStyleScope(mAncestors[i]);
>93c94
>< @@ -386,11 +388,26 @@ private:
>---
>> @@ -387,11 +389,29 @@ private:
>101a103,105
>> +/**
>> + * This pushes any display:contents nodes onto a TreeMatchContext.
>> + */
>119a124,147
>> diff --git a/layout/base/RestyleTracker.cpp b/layout/base/RestyleTracker.cpp
>> --- a/layout/base/RestyleTracker.cpp
>> +++ b/layout/base/RestyleTracker.cpp
>> @@ -71,17 +71,19 @@ CollectRestyles(nsISupports* aElement,
>>        !element->HasFlag(collector->tracker->RestyleBit())) {
>>      return PL_DHASH_NEXT;
>>    }
>>  
>>    NS_ASSERTION(!element->HasFlag(collector->tracker->RootBit()) ||
>>                 // Maybe we're just not reachable via the frame tree?
>>                 (element->GetFlattenedTreeParent() &&
>>                  (!element->GetFlattenedTreeParent()->GetPrimaryFrame()||
>> -                 element->GetFlattenedTreeParent()->GetPrimaryFrame()->IsLeaf())) ||
>> +                 element->GetFlattenedTreeParent()->GetPrimaryFrame()->IsLeaf()||
>> +                 element->GetCurrentDoc()->GetShell()->FrameManager()
>> +                   ->GetDisplayContents(element))) ||
>>                 // Or not reachable due to an async reinsert we have
>>                 // pending?  If so, we'll have a reframe hint around.
>>                 // That incidentally makes it safe that we still have
>>                 // the bit, since any descendants that didn't get added
>>                 // to the roots list because we had the bits will be
>>                 // completely restyled in a moment.
>>                 (aData.mChangeHint & nsChangeHint_ReconstructFrame),
>>                 "Why did this not get handled while processing mRestyleRoots?");
>123c151
>< @@ -3442,48 +3442,54 @@ nsCSSFrameConstructor::ConstructFrameFro
>---
>> @@ -3568,29 +3568,32 @@ nsCSSFrameConstructor::ConstructFrameFro
>136d163
>< +  const bool hasFilter = aState.mTreeMatchContext.mAncestorFilter.HasFilter();
>149,153d175
>< -  bool pushInsertionPoint = aState.mTreeMatchContext.mAncestorFilter.HasFilter() &&
>< -    parent && parent->IsActiveChildrenElement();
>< +  bool pushInsertionPoint = hasFilter && parent &&
>< +                            parent->IsActiveChildrenElement() &&
>< +                            adcp.IsEmpty();
>155,157c177,185
><      insertionPointPusher(pushInsertionPoint,
><                           aState.mTreeMatchContext,
><                           parent && parent->IsElement() ? parent->AsElement() : nullptr);
>---
>>      insertionPointPusher(aState.mTreeMatchContext);
>> -  if (parent && nsContentUtils::IsContentInsertionPoint(parent)) {
>> +  if (adcp.IsEmpty() && parent && nsContentUtils::IsContentInsertionPoint(parent)) {
>>      if (aState.mTreeMatchContext.mAncestorFilter.HasFilter()) {
>>        insertionPointPusher.PushAncestorAndStyleScope(parent);
>>      } else {
>>        insertionPointPusher.PushStyleScope(parent);
>>      }
>>    }
>160,171c188,193
><    // it in our various full-constructor functions.  In particular,
><    // since a number of full-constructor functions don't actually call
><    // ProcessChildren in some cases (e.g. for CSS anonymous table boxes
><    // or for situations where only anonymouse children are having
><    // frames constructed), this is the best place to bottleneck the
><    // pushing of the content instead of having to do it in multiple
><    // places.
><    TreeMatchContext::AutoAncestorPusher
>< -    ancestorPusher(aState.mTreeMatchContext.mAncestorFilter.HasFilter(),
>< -                   aState.mTreeMatchContext,
>< +    ancestorPusher(hasFilter, aState.mTreeMatchContext,
><                     content->IsElement() ? content->AsElement() : nullptr);
>---
>> @@ -3606,16 +3609,18 @@ nsCSSFrameConstructor::ConstructFrameFro
>>    if (aState.mTreeMatchContext.mAncestorFilter.HasFilter()) {
>>      ancestorPusher.PushAncestorAndStyleScope(content);
>>    } else {
>>      ancestorPusher.PushStyleScope(content);
>>    }
>185c207
>< @@ -4277,19 +4283,26 @@ nsCSSFrameConstructor::FindDisplayData(c
>---
>> @@ -4457,17 +4462,19 @@ nsCSSFrameConstructor::FindDisplayData(c
>190c212
><                         &nsCSSFrameConstructor::ConstructTableRow) },
>---
>>                         &nsCSSFrameConstructor::ConstructTableRowOrRowGroup) },
>200,204d221
>< +  // See the mDisplay fixup code in nsRuleNode::ComputeDisplayData.
>< +  MOZ_ASSERT(aDisplay->mDisplay != NS_STYLE_DISPLAY_CONTENTS ||
>< +             !aElement->IsRootOfNativeAnonymousSubtree(),
>< +             "display:contents on anonymous content is unsupported");
>< +
>211,213c228
><  nsCSSFrameConstructor::ConstructScrollableBlock(nsFrameConstructorState& aState,
><                                                  FrameConstructionItem&   aItem,
>< @@ -4396,31 +4409,32 @@ nsCSSFrameConstructor::InitAndRestoreFra
>---
>> @@ -4576,31 +4583,32 @@ nsCSSFrameConstructor::InitAndRestoreFra
>261,330c276,279
>< @@ -4929,19 +4943,28 @@ nsCSSFrameConstructor::ConstructFrame(ns
><    FrameConstructionItemList items;
><    {
><      // Skip flex item style-fixup during our AddFrameConstructionItems() call:
><      TreeMatchContext::AutoFlexItemStyleFixupSkipper
><        flexItemStyleFixupSkipper(aState.mTreeMatchContext);
><  
><      AddFrameConstructionItems(aState, aContent, true, aParentFrame, items);
><    }
>< -  items.SetTriedConstructingFrames();
>< -
>< -  for (FCItemIterator iter(items); !iter.IsDone(); iter.Next()) {
>< +  ConstructFrames(aState, items, aParentFrame, aFrameItems);
>< +}
>< +
>< +void
>< +nsCSSFrameConstructor::ConstructFrames(nsFrameConstructorState&   aState,
>< +                                       FrameConstructionItemList& aItems,
>< +                                       nsIFrame*                  aParentFrame,
>< +                                       nsFrameItems&              aFrameItems)
>< +
>< +{
>< +  aItems.FlushUndisplayedItems();
>< +  for (FCItemIterator iter(aItems); !iter.IsDone(); iter.Next()) {
><      NS_ASSERTION(iter.item().DesiredParentType() == GetParentType(aParentFrame),
><                   "This is not going to work");
><      ConstructFramesFromItem(aState, iter, aParentFrame, aFrameItems);
><    }
><  }
><  
><  void
><  nsCSSFrameConstructor::AddFrameConstructionItems(nsFrameConstructorState& aState,
>< @@ -5014,16 +5037,33 @@ nsCSSFrameConstructor::SetAsUndisplayedC
><      }
><      return;
><    }
><  
><    NS_ASSERTION(!aIsGeneratedContent, "Should have had pseudo type");
><    aList.AppendUndisplayedItem(aContent, aStyleContext);
><  }
><  
>< +/* static */ void
>< +nsCSSFrameConstructor::SetAsDisplayContentsContent(FrameConstructionItemList& aList,
>< +                                                   nsIContent* aContent,
>< +                                                   nsStyleContext* aStyleContext,
>< +                                                   bool aIsGeneratedContent)
>< +{
>< +  if (aStyleContext->GetPseudo()) {
>< +    if (aIsGeneratedContent) {
>< +      aContent->UnbindFromTree();
>< +    }
>< +    return;
>< +  }
>< +
>< +  NS_ASSERTION(!aIsGeneratedContent, "Should have had pseudo type");
>< +  aList.AppendDisplayContentsItem(aContent, aStyleContext);
>< +}
>< +
><  void
><  nsCSSFrameConstructor::AddFrameConstructionItemsInternal(nsFrameConstructorState& aState,
><                                                           nsIContent* aContent,
><                                                           nsIFrame* aParentFrame,
><                                                           nsIAtom* aTag,
><                                                           int32_t aNameSpaceID,
><                                                           bool aSuppressWhiteSpaceOptimizations,
><                                                           nsStyleContext* aStyleContext,
>< @@ -5229,17 +5269,17 @@ nsCSSFrameConstructor::AddFrameConstruct
><    item->mIsPopup = isPopup;
><    item->mIsForSVGAElement = aNameSpaceID == kNameSpaceID_SVG &&
><                              aTag == nsGkAtoms::a;
>---
>> @@ -5359,16 +5367,62 @@ nsCSSFrameConstructor::AddFrameConstruct
>>      !display->IsAbsolutelyPositionedStyle() &&
>>      !(bits & FCDATA_IS_TABLE_PART) &&
>>      !(bits & FCDATA_IS_SVG_TEXT);
>332c281
><    if (canHavePageBreak && display->mBreakAfter) {
>---
>>    if (canHavePageBreak && display->mBreakBefore) {
>336,358d284
>< -  if (bits & FCDATA_IS_INLINE) {
>< +  if (bits & (FCDATA_IS_INLINE | FCDATA_IS_CONTENTS)) {
><      // To correctly set item->mIsAllInline we need to build up our child items
><      // right now.
><      BuildInlineChildItems(aState, *item,
><                            aFlags & ITEM_IS_WITHIN_SVG_TEXT,
><                            aFlags & ITEM_ALLOWS_TEXT_PATH_CHILD);
><      item->mHasInlineEnds = true;
><      item->mIsBlock = false;
><    } else {
>< @@ -5284,20 +5324,63 @@ nsCSSFrameConstructor::AddFrameConstruct
><      // out-of-flow, we can't use it here.  But we _can_ say that the frame will
><      // for sure end up in-flow if it's not floated or absolutely positioned.
><      item->mIsBlock = !isInline &&
><                       !display->IsAbsolutelyPositionedStyle() &&
><                       !display->IsFloatingStyle() &&
><                       !(bits & FCDATA_IS_SVG_TEXT);
><    }
><  
>< -  if (item->mIsAllInline) {
>< -    aItems.InlineItemAdded();
>< -  } else if (item->mIsBlock) {
>< -    aItems.BlockItemAdded();
>360,370c286,293
>< +    SetAsDisplayContentsContent(aItems, aContent, item->mStyleContext,
>< +                                isGeneratedContent);
>< +
>< +    FrameConstructionItemList items;
>< +    // Move the child items to 'items' (including its UndisplayedItems).
>< +    {
>< +      FCItemIterator iter(item->mChildItems);
>< +      if (!iter.IsDone()) {
>< +        FCItemIterator end(item->mChildItems);
>< +        end.SetToEnd();
>< +        iter.AppendItemsToList(end, items);
>---
>> +    if (!GetDisplayContents(aContent)) {
>> +      if (styleContext->GetPseudo()) {
>> +        if (isGeneratedContent) {
>> +          aContent->UnbindFromTree();
>> +        }
>> +      } else {
>> +        MOZ_ASSERT(!isGeneratedContent, "Should have had pseudo type");
>> +        aState.mFrameManager->SetDisplayContents(aContent, styleContext);
>371a295,296
>> +    } else {
>> +      aState.mFrameManager->ChangeDisplayContents(aContent, styleContext);
>374,384c299,303
>< +    // Append any siblings after 'item' to 'items'.
>< +    {
>< +      FCItemIterator iter(aItems);
>< +      iter.SetToEnd();
>< +      while (&iter.item() != item) {
>< +        iter.Prev();
>< +      }
>< +      iter.Next();
>< +      while (!iter.IsDone()) {
>< +        iter.AppendItemToList(items); // advances 'iter'
>< +      }
>---
>> +    TreeMatchContext::AutoAncestorPusher ancestorPusher(aState.mTreeMatchContext);
>> +    if (aState.mTreeMatchContext.mAncestorFilter.HasFilter()) {
>> +      ancestorPusher.PushAncestorAndStyleScope(aContent->AsElement());
>> +    } else {
>> +      ancestorPusher.PushStyleScope(aContent->AsElement());
>387,398c306,307
>< +    aItems.RemoveItem(item);
>< +    delete item;
>< +
>< +    // Append the collected child items and siblings to aItems.
>< +    {
>< +      FCItemIterator iter(items);
>< +      if (!iter.IsDone()) {
>< +        FCItemIterator end(items);
>< +        end.SetToEnd();
>< +        iter.AppendItemsToList(end, aItems);
>< +      }
>< +      items.StealUndisplayedItems(aItems);
>---
>> +    if (aParentFrame) {
>> +      aParentFrame->AddStateBits(NS_FRAME_MAY_HAVE_GENERATED_CONTENT);
>400,404c309,326
>< +  } else {
>< +    if (item->mIsAllInline) {
>< +      aItems.InlineItemAdded();
>< +    } else if (item->mIsBlock) {
>< +      aItems.BlockItemAdded();
>---
>> +    CreateGeneratedContentItem(aState, aParentFrame, aContent, styleContext,
>> +                               nsCSSPseudoElements::ePseudo_before, aItems);
>> +
>> +    FlattenedChildIterator iter(aContent);
>> +    for (nsIContent* child = iter.GetNextChild(); child; child = iter.GetNextChild()) {
>> +      nsRefPtr<nsStyleContext> childContext =
>> +        ResolveStyleContext(styleContext, child, nullptr);
>> +      AddFrameConstructionItemsInternal(aState, child, aParentFrame,
>> +                                        child->Tag(), child->GetNameSpaceID(),
>> +                                        aSuppressWhiteSpaceOptimizations,
>> +                                        childContext, aFlags,
>> +                                        aAnonChildren, aItems);
>> +    }
>> +
>> +    CreateGeneratedContentItem(aState, aParentFrame, aContent, styleContext,
>> +                               nsCSSPseudoElements::ePseudo_after, aItems);
>> +    if (canHavePageBreak && display->mBreakAfter) {
>> +      AddPageBreakItem(aContent, aStyleContext, aItems);
>405a328,342
>> +    return;
>> +  }
>> +
>>    FrameConstructionItem* item =
>>      aItems.AppendItem(data, aContent, aTag, aNameSpaceID,
>>                        pendingBinding, styleContext.forget(),
>>                        aSuppressWhiteSpaceOptimizations, aAnonChildren);
>>    if (!item) {
>>      if (isGeneratedContent) {
>>        aContent->UnbindFromTree();
>>      }
>> @@ -5622,29 +5676,36 @@ nsCSSFrameConstructor::ReconstructDocEle
>>    if (!rootElement) {
>>      /* nothing to do */
>>      return NS_OK;
>407,414c344
><  
><    // Our item should be treated as a line participant if we have the relevant
><    // bit and are going to be in-flow.  Note that this really only matters if
><    // our ancestor is a box or some such, so the fact that we might have an
><    // inline ancestor that might become a containing block is not relevant here.
><    if ((bits & FCDATA_IS_LINE_PARTICIPANT) &&
><        ((bits & FCDATA_DISALLOW_OUT_OF_FLOW) ||
>< @@ -5461,24 +5544,31 @@ nsCSSFrameConstructor::ReconstructDocEle
>---
>>    return RecreateFramesForContent(rootElement, false);
>418c348,349
><  nsCSSFrameConstructor::GetFrameFor(nsIContent* aContent)
>---
>> -nsCSSFrameConstructor::GetFrameFor(nsIContent* aContent)
>> +nsCSSFrameConstructor::GetInsertionFrameFor(nsIContent* aContent)
>434c365
>< +      frame = parent ? GetFrameFor(parent) : nullptr;
>---
>> +      frame = parent ? GetInsertionFrameFor(parent) : nullptr;
>454c385,471
>< @@ -5960,17 +6050,17 @@ nsCSSFrameConstructor::GetInsertionPrevS
>---
>> @@ -5742,31 +5803,75 @@ nsCSSFrameConstructor::GetFloatContainin
>>  
>>  /**
>>   * This function will check whether aContainer has :after generated content.
>>   * If so, appending to it should actually insert.  The return value is the
>>   * parent to use for newly-appended content.  *aAfterFrame points to the :after
>>   * frame before which appended content should go, if there is one.
>>   */
>>  static nsIFrame*
>> -AdjustAppendParentForAfterContent(nsPresContext* aPresContext,
>> +AdjustAppendParentForAfterContent(nsFrameManager* aFrameManager,
>>                                    nsIContent* aContainer,
>>                                    nsIFrame* aParentFrame,
>> +                                  nsIContent* aChild,
>>                                    nsIFrame** aAfterFrame)
>>  {
>> -  // See if the parent has an :after pseudo-element.  Check for the presence
>> -  // of style first, since nsLayoutUtils::GetAfterFrame is sorta expensive.
>> -  nsStyleContext* parentStyle = aParentFrame->StyleContext();
>> -  if (nsLayoutUtils::HasPseudoStyle(aContainer, parentStyle,
>> +  // If the parent frame has any pseudo-elements or aContainer is a
>> +  // display:contents node then we need to walk through the child
>> +  // frames to find the first one that is either a ::after frame for an
>> +  // ancestor of aChild or a frame that is for a node later in the
>> +  // document than aChild and return that in aAfterFrame.
>> +  if (nsLayoutUtils::HasPseudoStyle(aContainer, aParentFrame->StyleContext(),
>>                                      nsCSSPseudoElements::ePseudo_after,
>> -                                    aPresContext)) {
>> -    // Ensure that the :after frame is on the principal child list.
>> -    aParentFrame->DrainSelfOverflowList();
>> -
>> -    nsIFrame* afterFrame = nsLayoutUtils::GetAfterFrame(aParentFrame);
>> +                                    aParentFrame->PresContext()) ||
>> +      GetGenConPseudos(aParentFrame) ||
>> +      aFrameManager->GetDisplayContents(aContainer)) {
>> +    nsIFrame* afterFrame = nullptr;
>> +    nsIFrame* parent = aParentFrame->LastContinuation();
>> +    bool done = false;
>> +    while (!done && parent) {
>> +      // Ensure that all normal flow children are on the principal child list.
>> +      parent->DrainSelfOverflowList();
>> +
>> +      nsIFrame* child = parent->GetLastChild(nsIFrame::kPrincipalList);
>> +      if (child && child->IsPseudoFrame(aContainer) &&
>> +          !child->IsGeneratedContentFrame()) {
>> +        // Drill down into non-generated pseudo frames of aContainer.
>> +        parent = nsLayoutUtils::LastContinuationWithChild(child);
>> +        continue;
>> +      }
>> +
>> +      for (; child; child = child->GetPrevSibling()) {
>> +        nsIContent* c = child->GetContent();
>> +        if (child->IsGeneratedContentFrame()) {
>> +          nsIContent* p = c->GetParent();
>> +          if (c->Tag() == nsGkAtoms::mozgeneratedcontentafter) {
>> +            if (!nsContentUtils::ContentIsDescendantOf(aChild, p) &&
>> +                (!c->IsInAnonymousSubtree() || c->GetBindingParent() != aContainer) &&
>> +                nsContentUtils::PositionIsBefore(p, aChild)) {
>> +              // ::after generated content for content earlier in the doc and not
>> +              // for an ancestor.
>> +              done = true;
>> +              break;
>> +            }
>> +          } else if (nsContentUtils::PositionIsBefore(p, aChild)) {
>> +            // Non-::after generated content for content earlier in the doc.
>> +            done = true;
>> +            break;
>> +          }
>> +        } else if (nsContentUtils::PositionIsBefore(c, aChild)) {
>> +          // Content is before aChild.
>> +          done = true;
>> +          break;
>> +        }
>> +        afterFrame = child;
>> +      }
>> +
>> +      parent = parent->GetPrevContinuation();
>> +    }
>>      if (afterFrame) {
>>        *aAfterFrame = afterFrame;
>>        return afterFrame->GetParent();
>>      }
>>    }
>>  
>>    *aAfterFrame = nullptr;
>>  
>> @@ -6132,17 +6237,18 @@ nsCSSFrameConstructor::GetInsertionPrevS
>464c481,482
>< +  nsIContent* container = GetDisplayContents(aContainer) ? aContainer : aParentFrame->GetContent();
>---
>> +  const bool boxContents = GetDisplayContents(aContainer);
>> +  nsIContent* container = boxContents ? aContainer : aParentFrame->GetContent();
>473c491,554
>< @@ -6166,16 +6256,20 @@ nsCSSFrameConstructor::MaybeConstructLaz
>---
>> @@ -6162,29 +6268,35 @@ nsCSSFrameConstructor::GetInsertionPrevS
>>    uint8_t childDisplay = UNSET_DISPLAY;
>>    nsIFrame* prevSibling = FindPreviousSibling(iter, childDisplay);
>>  
>>    // Now, find the geometric parent so that we can handle
>>    // continuations properly. Use the prev sibling if we have it;
>>    // otherwise use the next sibling.
>>    if (prevSibling) {
>>      aParentFrame = prevSibling->GetParent()->GetContentInsertionFrame();
>> -  }
>> -  else {
>> +  } else {
>>      // If there is no previous sibling, then find the frame that follows
>>      if (aEndSkipChild) {
>>        iter.Seek(aEndSkipChild);
>>        iter.GetPreviousChild();
>>      }
>>      nsIFrame* nextSibling = FindNextSibling(iter, childDisplay);
>> -
>> +    if (boxContents) {
>> +      if (nextSibling) {
>> +        aParentFrame = nextSibling->GetParent()->GetContentInsertionFrame();
>> +        return nextSibling->GetPrevSibling();
>> +      }
>> +      return GetInsertionPrevSibling(aParentFrame, aContainer->GetParent(),
>> +                                     aContainer, aIsAppend,
>> +                                     aIsRangeInsertSafe, nullptr, nullptr);
>> +    }
>>      if (nextSibling) {
>>        aParentFrame = nextSibling->GetParent()->GetContentInsertionFrame();
>> -    }
>> -    else {
>> +    } else {
>>        // No previous or next sibling, so treat this like an appended frame.
>>        *aIsAppend = true;
>>        if (IsFramePartOfIBSplit(aParentFrame)) {
>>          // Since we're appending, we'll walk to the last anonymous frame
>>          // that was created for the broken inline frame.  But don't walk
>>          // to the trailing inline if it's empty; stop at the block.
>>          aParentFrame = GetLastIBSplitSibling(aParentFrame, false);
>>        }
>> @@ -6192,19 +6304,18 @@ nsCSSFrameConstructor::GetInsertionPrevS
>>        // before the AdjustAppendParentForAfterContent call.
>>        aParentFrame = nsLayoutUtils::LastContinuationWithChild(aParentFrame);
>>        // Deal with fieldsets
>>        aParentFrame = ::GetAdjustedParentFrame(aParentFrame,
>>                                                aParentFrame->GetType(),
>>                                                aChild);
>>        nsIFrame* appendAfterFrame;
>>        aParentFrame =
>> -        ::AdjustAppendParentForAfterContent(mPresShell->GetPresContext(),
>> -                                            container, aParentFrame,
>> -                                            &appendAfterFrame);
>> +        ::AdjustAppendParentForAfterContent(this, container, aParentFrame,
>> +                                            aChild, &appendAfterFrame);
>>        prevSibling = ::FindAppendPrevSibling(aParentFrame, appendAfterFrame);
>>      }
>>    }
>>  
>>    *aIsRangeInsertSafe = (childDisplay == UNSET_DISPLAY);
>>    return prevSibling;
>>  }
>>  
>> @@ -6339,16 +6450,20 @@ nsCSSFrameConstructor::MaybeConstructLaz
>482c563
>< +    // XXXmats no lazy frames for display:contents descendants yet.
>---
>> +    // XXXmats no lazy frames for display:contents descendants yet (bug 979782).
>494c575
>< @@ -6288,18 +6382,18 @@ void
>---
>> @@ -6461,18 +6576,18 @@ void
>515c596,647
>< @@ -6868,17 +6962,18 @@ nsCSSFrameConstructor::ContentRangeInser
>---
>> @@ -6621,17 +6736,17 @@ nsCSSFrameConstructor::ContentAppended(n
>>      nsIContent* bindingParent = aContainer->GetBindingParent();
>>      LAYOUT_PHASE_TEMP_EXIT();
>>      nsresult rv = RecreateFramesForContent(bindingParent, false);
>>      LAYOUT_PHASE_TEMP_REENTER();
>>      return rv;
>>    }
>>  
>>    // Get the frame associated with the content
>> -  nsIFrame* parentFrame = GetFrameFor(aContainer);
>> +  nsIFrame* parentFrame = GetInsertionFrameFor(aContainer);
>>  
>>    // See comment in ContentRangeInserted for why this is necessary.
>>    if (!parentFrame && !aContainer->IsActiveChildrenElement()) {
>>      return NS_OK;
>>    }
>>  
>>    if (aAllowLazyConstruction &&
>>        MaybeConstructLazily(CONTENTAPPEND, aContainer, aFirstNewContent)) {
>> @@ -6694,19 +6809,18 @@ nsCSSFrameConstructor::ContentAppended(n
>>    // We should never get here with fieldsets, since they have multiple
>>    // insertion points.
>>    NS_ASSERTION(parentFrame->GetType() != nsGkAtoms::fieldSetFrame,
>>                 "Unexpected parent");
>>  
>>    // Deal with possible :after generated content on the parent
>>    nsIFrame* parentAfterFrame;
>>    parentFrame =
>> -    ::AdjustAppendParentForAfterContent(mPresShell->GetPresContext(),
>> -                                        aContainer, parentFrame,
>> -                                        &parentAfterFrame);
>> +    ::AdjustAppendParentForAfterContent(this, aContainer, parentFrame,
>> +                                        aFirstNewContent, &parentAfterFrame);
>>    
>>    // Create some new frames
>>    nsFrameConstructorState state(mPresShell,
>>                                  GetAbsoluteContainingBlock(parentFrame, FIXED_POS),
>>                                  GetAbsoluteContainingBlock(parentFrame, ABS_POS),
>>                                  GetFloatContainingBlock(parentFrame));
>>    state.mTreeMatchContext.InitAncestors(aContainer->AsElement());
>>  
>> @@ -7054,26 +7168,27 @@ nsCSSFrameConstructor::ContentRangeInser
>>      // the children of the host.
>>      nsIContent* bindingParent = aContainer->GetBindingParent();
>>      LAYOUT_PHASE_TEMP_EXIT();
>>      nsresult rv = RecreateFramesForContent(bindingParent, false);
>>      LAYOUT_PHASE_TEMP_REENTER();
>>      return rv;
>>    }
>>  
>> -  nsIFrame* parentFrame = GetFrameFor(aContainer);
>> +  nsIFrame* parentFrame = GetInsertionFrameFor(aContainer);
>535c667,690
>< @@ -7297,28 +7392,42 @@ nsCSSFrameConstructor::ContentRemoved(ns
>---
>> @@ -7350,20 +7465,19 @@ nsCSSFrameConstructor::ContentRangeInser
>>                   frame1->GetType() == nsGkAtoms::fieldSetFrame ||
>>                   (frame1->GetParent() &&
>>                    frame1->GetParent()->GetType() == nsGkAtoms::fieldSetFrame),
>>                   "Unexpected frame types");
>>  #endif
>>      isAppend = true;
>>      nsIFrame* appendAfterFrame;
>>      parentFrame =
>> -      ::AdjustAppendParentForAfterContent(mPresShell->GetPresContext(),
>> -                                          container,
>> +      ::AdjustAppendParentForAfterContent(this, container,
>>                                            frameItems.FirstChild()->GetParent(),
>> -                                          &appendAfterFrame);
>> +                                          aStartChild, &appendAfterFrame);
>>      prevSibling = ::FindAppendPrevSibling(parentFrame, appendAfterFrame);
>>    }
>>  
>>    if (haveFirstLineStyle && parentFrame == containingBlock) {
>>      // It's possible that the new frame goes into a first-line
>>      // frame. Look at it and see...
>>      if (isAppend) {
>>        // Use append logic when appending
>> @@ -7493,28 +7607,42 @@ nsCSSFrameConstructor::ContentRemoved(ns
>584,600c739,749
>< @@ -8051,23 +8160,17 @@ nsCSSFrameConstructor::ReplicateFixedFra
><        AddFrameConstructionItemsInternal(state, content, canvasFrame,
><                                          content->Tag(),
><                                          content->GetNameSpaceID(),
><                                          true,
><                                          styleContext,
><                                          ITEM_ALLOW_XBL_BASE |
><                                            ITEM_ALLOW_PAGE_BREAK,
><                                          items);
>< -      items.SetTriedConstructingFrames();
>< -      for (FCItemIterator iter(items); !iter.IsDone(); iter.Next()) {
>< -        NS_ASSERTION(iter.item().DesiredParentType() ==
>< -                       GetParentType(canvasFrame),
>< -                     "This is not going to work");
>< -        ConstructFramesFromItem(state, iter, canvasFrame, fixedPlaceholders);
>< -      }
>< +      ConstructFrames(state, items, canvasFrame, fixedPlaceholders);
>---
>> @@ -8328,17 +8456,17 @@ nsCSSFrameConstructor::GetInsertionPoint
>>  
>>    nsIContent* insertionElement;
>>    if (aChildContent) {
>>      // We've got an explicit insertion child. Check to see if it's
>>      // anonymous.
>>      if (aChildContent->GetBindingParent() == aContainer) {
>>        // This child content is anonymous. Don't use the insertion
>>        // point, since that's only for the explicit kids.
>> -      return GetFrameFor(aContainer);
>> +      return GetInsertionFrameFor(aContainer);
>602d750
><    }
>604,610c752,756
><    // Add the placeholders to our primary child list.
><    // XXXbz this is a little screwed up, since the fixed frames will have 
><    // broken auto-positioning. Oh, well.
><    NS_ASSERTION(!canvasFrame->GetFirstPrincipalChild(),
><                 "leaking frames; doc root continuation must be empty");
>< @@ -8940,35 +9043,23 @@ nsCSSFrameConstructor::CreateNeededTable
><  }
>---
>>      insertionElement = bindingManager->FindNestedInsertionPoint(aContainer, aChildContent);
>>    }
>>    else {
>>      bool multiple;
>>      insertionElement = bindingManager->FindNestedSingleInsertionPoint(aContainer, &multiple);
>612,620c758,761
><  inline void
><  nsCSSFrameConstructor::ConstructFramesFromItemList(nsFrameConstructorState& aState,
><                                                     FrameConstructionItemList& aItems,
><                                                     nsIFrame* aParentFrame,
><                                                     nsFrameItems& aFrameItems)
><  {
>< -  aItems.SetTriedConstructingFrames();
>< -
><    CreateNeededTablePseudos(aState, aItems, aParentFrame);
>---
>> @@ -8349,17 +8477,17 @@ nsCSSFrameConstructor::GetInsertionPoint
>>        return nullptr;
>>      }
>>    }
>622,623c763,764
><    if (aParentFrame->GetType() == nsGkAtoms::flexContainerFrame) {
><      CreateNeededAnonFlexItems(aState, aItems, aParentFrame);
>---
>>    if (!insertionElement) {
>>      insertionElement = aContainer;
>626,640c767,768
>< -#ifdef DEBUG
>< -  for (FCItemIterator iter(aItems); !iter.IsDone(); iter.Next()) {
>< -    NS_ASSERTION(iter.item().DesiredParentType() == GetParentType(aParentFrame),
>< -                 "Needed pseudos didn't get created; expect bad things");
>< -  }
>< -#endif
>< -
>< -  for (FCItemIterator iter(aItems); !iter.IsDone(); iter.Next()) {
>< -    ConstructFramesFromItem(aState, iter, aParentFrame, aFrameItems);
>< -  }
>< -
>< +  ConstructFrames(aState, aItems, aParentFrame, aFrameItems);
><    NS_ASSERTION(!aState.mHavePendingPopupgroup,
><                 "Should have proccessed it by now");
><  }
>---
>> -  nsIFrame* insertionPoint = GetFrameFor(insertionElement);
>> +  nsIFrame* insertionPoint = GetInsertionFrameFor(insertionElement);
>642,658c770,773
><  void
><  nsCSSFrameConstructor::ProcessChildren(nsFrameConstructorState& aState,
><                                         nsIContent*              aContent,
><                                         nsStyleContext*          aStyleContext,
>< @@ -11022,16 +11113,19 @@ Iterator::AppendItemsToList(const Iterat
><  
><    // We can't just move our guts to the other list if it already has
><    // some information or if we're not moving our entire list.
><    if (!AtStart() || !aEnd.IsDone() || !aTargetList.IsEmpty() ||
><        !aTargetList.mUndisplayedItems.IsEmpty()) {
><      do {
><        AppendItemToList(aTargetList);
><      } while (*this != aEnd);
>< +    // Hmm, if "AtStart() && aEnd.IsDone()" is true, i.e. we're moving all of
>< +    // mList to aTargetList, shouldn't we append mList.mUndisplayedItems
>< +    // to aTargetList.mDesiredParentCounts too?
><      return;
>---
>>    // fieldsets have multiple insertion points.  Note that we might
>>    // have to look at insertionElement here...
>>    if (aMultiple && insertionElement->IsHTML(nsGkAtoms::fieldset)) {
>>      *aMultiple = true;
>661,665c776
><    // move over the list of items
><    PR_INSERT_AFTER(&aTargetList.mItems, &mList.mItems);
><    // Need to init when we remove to makd ~FrameConstructionItemList work right.
><    PR_REMOVE_AND_INIT_LINK(&mList.mItems);
><  
>---
>>    return insertionPoint;
>669,695c780
>< @@ -279,16 +279,25 @@ private:
><    // Construct a frame for aContent and put it in aFrameItems.  This should
><    // only be used in cases when it's known that the frame won't need table
><    // pseudo-frame construction and the like.
><    void ConstructFrame(nsFrameConstructorState& aState,
><                        nsIContent*              aContent,
><                        nsIFrame*                aParentFrame,
><                        nsFrameItems&            aFrameItems);
><  
>< +  /**
>< +   * Calls FlushUndisplayedItems on aItems and then constructs frames for all
>< +   * the items in aItems and puts them in aFrameItems.
>< +   */
>< +  void ConstructFrames(nsFrameConstructorState&   aState,
>< +                       FrameConstructionItemList& aItems,
>< +                       nsIFrame*                  aParentFrame,
>< +                       nsFrameItems&              aFrameItems);
>< +
><    // Add the frame construction items for the given aContent and aParentFrame
><    // to the list.  This might add more than one item in some rare cases.
><    // If aSuppressWhiteSpaceOptimizations is true, optimizations that
><    // may suppress the construction of white-space-only text frames
><    // must be skipped for these items and items around them.
><    void AddFrameConstructionItems(nsFrameConstructorState& aState,
><                                   nsIContent*              aContent,
><                                   bool                     aSuppressWhiteSpaceOptimizations,
>< @@ -559,16 +568,20 @@ private:
>---
>> @@ -560,16 +560,20 @@ private:
>716,753c801,808
>< @@ -636,62 +649,66 @@ private:
><      FindDataByTag(nsIAtom* aTag, Element* aElement,
><                    nsStyleContext* aStyleContext,
><                    const FrameConstructionDataByTag* aDataPtr,
><                    uint32_t aDataLength);
><  
><    /* A class representing a list of FrameConstructionItems */
><    class FrameConstructionItemList {
><    public:
>< -    FrameConstructionItemList() :
>< -      mInlineCount(0),
>< -      mBlockCount(0),
>< -      mLineParticipantCount(0),
>< -      mItemCount(0),
>< -      mLineBoundaryAtStart(false),
>< -      mLineBoundaryAtEnd(false),
>< -      mParentHasNoXBLChildren(false),
>< -      mTriedConstructingFrames(false)
>< +    FrameConstructionItemList()
>< +      : mInlineCount(0)
>< +      , mBlockCount(0)
>< +      , mLineParticipantCount(0)
>< +      , mItemCount(0)
>< +      , mLineBoundaryAtStart(false)
>< +      , mLineBoundaryAtEnd(false)
>< +      , mParentHasNoXBLChildren(false)
><      {
><        PR_INIT_CLIST(&mItems);
><        memset(mDesiredParentCounts, 0, sizeof(mDesiredParentCounts));
><      }
><  
><      ~FrameConstructionItemList() {
><        PRCList* cur = PR_NEXT_LINK(&mItems);
><        while (cur != &mItems) {
><          PRCList* next = PR_NEXT_LINK(cur);
><          delete ToItem(cur);
><          cur = next;
><        }
>---
>> @@ -1368,17 +1372,21 @@ private:
>>                         nsStyleContext*          aStyleContext,
>>                         nsIFrame*                aFrame,
>>                         const bool               aCanHaveGeneratedContent,
>>                         nsFrameItems&            aFrameItems,
>>                         const bool               aAllowBlockStyles,
>>                         PendingBinding*          aPendingBinding,
>>                         nsIFrame*                aPossiblyLeafFrame = nullptr);
>755,908c810,815
><        // Leaves our mItems pointing to deleted memory in both directions,
><        // but that's OK at this point.
>< -
>< +    }
>< +    void FlushUndisplayedItems() {
><        // Create the undisplayed entries for our mUndisplayedItems, if any, but
><        // only if we have tried constructing frames for this item list.  If we
><        // haven't, then we're just throwing it away and will probably try again.
>< -      if (!mUndisplayedItems.IsEmpty() && mTriedConstructingFrames) {
>< +      if (!mUndisplayedItems.IsEmpty()) {
><          // We could store the frame manager in a member, but just
><          // getting it off the style context is not too bad.
><          nsFrameManager *mgr =
><            mUndisplayedItems[0].mStyleContext->PresContext()->FrameManager();
><          for (uint32_t i = 0; i < mUndisplayedItems.Length(); ++i) {
><            UndisplayedItem& item = mUndisplayedItems[i];
>< -          mgr->SetUndisplayedContent(item.mContent, item.mStyleContext);
>< +          if (MOZ_UNLIKELY(item.mIsDisplayContents)) {
>< +            mgr->SetDisplayContents(item.mContent, item.mStyleContext);
>< +          } else {
>< +            mgr->SetUndisplayedContent(item.mContent, item.mStyleContext);
>< +          }
><          }
>< +        mUndisplayedItems.Clear();
><        }
><      }
><  
><      void SetLineBoundaryAtStart(bool aBoundary) { mLineBoundaryAtStart = aBoundary; }
><      void SetLineBoundaryAtEnd(bool aBoundary) { mLineBoundaryAtEnd = aBoundary; }
><      void SetParentHasNoXBLChildren(bool aHasNoXBLChildren) {
><        mParentHasNoXBLChildren = aHasNoXBLChildren;
><      }
>< -    void SetTriedConstructingFrames() { mTriedConstructingFrames = true; }
><      bool HasLineBoundaryAtStart() { return mLineBoundaryAtStart; }
><      bool HasLineBoundaryAtEnd() { return mLineBoundaryAtEnd; }
><      bool ParentHasNoXBLChildren() { return mParentHasNoXBLChildren; }
><      bool IsEmpty() const { return PR_CLIST_IS_EMPTY(&mItems); }
><      bool AnyItemsNeedBlockParent() const { return mLineParticipantCount != 0; }
><      bool AreAllItemsInline() const { return mInlineCount == mItemCount; }
><      bool AreAllItemsBlock() const { return mBlockCount == mItemCount; }
><      bool AllWantParentType(ParentType aDesiredParentType) const {
>< @@ -713,21 +730,47 @@ private:
><          new FrameConstructionItem(aFCData, aContent, aTag, aNameSpaceID,
><                                    aPendingBinding, aStyleContext,
><                                    aSuppressWhiteSpaceOptimizations);
><        PR_APPEND_LINK(item, &mItems);
><        ++mItemCount;
><        ++mDesiredParentCounts[item->DesiredParentType()];
><        return item;
><      }
>< +    /**
>< +     * Unhook aItem from this list.  This method only deals with undoing the
>< +     * effects of AppendItem.  The caller has to deal with mInlineCount etc.
>< +     * possibly by calling AdjustCountsForItem.
>< +     */
>< +    void RemoveItem(FrameConstructionItem* aItem)
>< +    {
>< +      PR_REMOVE_LINK(aItem);
>< +      MOZ_ASSERT(mItemCount > 0);
>< +      --mItemCount;
>< +      MOZ_ASSERT(mDesiredParentCounts[aItem->DesiredParentType()] > 0);
>< +      --mDesiredParentCounts[aItem->DesiredParentType()];
>< +    }
><  
><      void AppendUndisplayedItem(nsIContent* aContent,
><                                 nsStyleContext* aStyleContext) {
><        mUndisplayedItems.AppendElement(UndisplayedItem(aContent, aStyleContext));
><      }
>< +    void AppendDisplayContentsItem(nsIContent* aContent,
>< +                                   nsStyleContext* aStyleContext) {
>< +      UndisplayedItem item(aContent, aStyleContext);
>< +      item.mIsDisplayContents = true;
>< +      mUndisplayedItems.AppendElement(item);
>< +    }
>< +    /**
>< +     * Move all UndisplayedItems in this list to aTargetList.
>< +     */
>< +    void StealUndisplayedItems(FrameConstructionItemList& aTargetList)
>< +    {
>< +      aTargetList.mUndisplayedItems.AppendElements(mUndisplayedItems);
>< +    }
><  
><      void InlineItemAdded() { ++mInlineCount; }
><      void BlockItemAdded() { ++mBlockCount; }
><      void LineParticipantItemAdded() { ++mLineParticipantCount; }
><  
><      class Iterator;
><      friend class Iterator;
><  
>< @@ -839,21 +882,23 @@ private:
><  
><    private:
><      static FrameConstructionItem* ToItem(PRCList* item) {
><        return static_cast<FrameConstructionItem*>(item);
><      }
><  
><      struct UndisplayedItem {
><        UndisplayedItem(nsIContent* aContent, nsStyleContext* aStyleContext) :
>< -        mContent(aContent), mStyleContext(aStyleContext)
>< +        mContent(aContent), mStyleContext(aStyleContext),
>< +        mIsDisplayContents(false)
><        {}
><  
><        nsIContent * const mContent;
><        nsRefPtr<nsStyleContext> mStyleContext;
>< +      bool mIsDisplayContents;
><      };
><  
><      // Adjust our various counts for aItem being added or removed.  aDelta
><      // should be either +1 or -1 depending on which is happening.
><      void AdjustCountsForItem(FrameConstructionItem* aItem, int32_t aDelta);
><  
><      PRCList mItems;
><      uint32_t mInlineCount;
>< @@ -864,19 +909,16 @@ private:
><      // True if there is guaranteed to be a line boundary before the
><      // frames created by these items
><      bool mLineBoundaryAtStart;
><      // True if there is guaranteed to be a line boundary after the
><      // frames created by these items
><      bool mLineBoundaryAtEnd;
><      // True if the parent is guaranteed to have no XBL anonymous children
><      bool mParentHasNoXBLChildren;
>< -    // True if we have tried constructing frames from this list
>< -    bool mTriedConstructingFrames;
>< -
><      nsTArray<UndisplayedItem> mUndisplayedItems;
><    };
><  
><    typedef FrameConstructionItemList::Iterator FCItemIterator;
><  
><    /* A struct representing an item for which frames might need to be
><     * constructed.  This contains all the information needed to construct the
><     * frame other than the parent frame and whatever would be stored in the
>< @@ -1691,16 +1733,20 @@ private:
><     * contexts and also handles unbinding undisplayed generated content
><     * as needed.
><     */
><    static void SetAsUndisplayedContent(FrameConstructionItemList& aList,
><                                        nsIContent* aContent,
><                                        nsStyleContext* aStyleContext,
><                                        bool aIsGeneratedContent);
><  
>< +  static void SetAsDisplayContentsContent(FrameConstructionItemList& aList,
>< +                                          nsIContent* aContent,
>< +                                          nsStyleContext* aStyleContext,
>< +                                          bool aIsGeneratedContent);
><  public:
><  
><    friend class nsFrameConstructorState;
><  
><  private:
><  
><    nsIDocument*        mDocument;  // Weak ref
>---
>> -  nsIFrame* GetFrameFor(nsIContent* aContent);
>> +  /**
>> +   * Return the insertion frame of the primary frame of aContent, or its nearest
>> +   * ancestor that isn't display:contents.
>> +   */
>> +  nsIFrame* GetInsertionFrameFor(nsIContent* aContent);
>909a817,823
>>    /**
>>     * These two functions are used when we start frame creation from a non-root
>>     * element. They should recreate the same state that we would have
>>     * arrived at if we had built frames from the root frame to aFrame.
>>     * Therefore, any calls to PushFloatContainingBlock and
>>     * PushAbsoluteContainingBlock during frame construction should get
>>     * corresponding logic in these functions.

Actions: View | Diff | Review

Attachments on bug 907396: 802681 | 802684 | 802685 | 802686 | 802687 | 802688 | 802689 | 802691 | 802692 | 802694 | 802695 | 805961 | 805966 | 805978 | 805980 | 805982 | 806000 | 806002 | 806173 | 806174 | 806177 | 8392917 | 8392920 | 8392929 | 8392932 | 8392934 | 8392953 | 8392954 | 8408496 | 8442107 | 8442117 | 8442176 | 8442192 | 8455264 | 8455266 | 8455274 | 8455281 | 8455290 | 8455386 | 8455502 | 8455503 | 8457452 | 8492588 | 8492589 | 8492590 | 8492591 | 8492593 | 8492594 | 8492595 | 8492596 | 8492597 | 8492598 | 8492600 | 8492601 | 8492602 | 8492603 | 8493349 | 8493408 | 8493412 | 8493953 | 8493956 | 8493957 | 8493977 | 8498158 | 8498173 | 8498181 | 8498189 | 8498191 | 8498197 | 8507588 | 8509088 | 8509092 | 8509095 | 8509098 | 8521591 | 8521869 | 8521871 | 8521873