Attachment 8493349 Details for Bug 907396

[patch] interdiff 2014-06-18 -- 2014-09-19 for the "Frame constructor changes for display:contents." patch

display-contents-Fctor-interdiff-2014-06-18--2014-09-19.diff (text/plain), 11.37 KB, created by Mats Palmgren (inactive)

(hide)

Description:

Filename:

MIME Type:

Creator: Mats Palmgren (inactive)

Size: 11.37 KB

patch

obsolete

>2c2
>< # Parent 80431d4fd0dada87e7327eee3044146a3ec96c9f
>---
>> # Parent af86ae864ba0acc6bca1bb62424ae5655cd18910
>9c9
>< @@ -2965,9 +2965,41 @@ RestyleManager::ComputeStyleChangeFor(ns
>---
>> @@ -3522,9 +3522,41 @@ RestyleManager::ComputeStyleChangeFor(ns
>27c27
>< +    for (nsIContent* p = aParent; p && fm->GetDisplayContents(p);
>---
>> +    for (nsIContent* p = aParent; p && fm->GetDisplayContentsStyleFor(p);
>54c54
>< @@ -23,17 +23,18 @@ struct TreeMatchContext;
>---
>> @@ -25,17 +25,18 @@ struct TreeMatchContext;
>72c72
><    RestyleManager(nsPresContext* aPresContext);
>---
>>    explicit RestyleManager(nsPresContext* aPresContext);
>74c74
>< @@ -270,17 +271,18 @@ private:
>---
>> @@ -394,17 +395,18 @@ private:
>94c94
>< @@ -396,11 +398,32 @@ private:
>---
>> @@ -544,11 +546,32 @@ private:
>130c130
>< @@ -4,16 +4,18 @@
>---
>> @@ -4,19 +4,22 @@
>139a140
>> +#include "GeckoProfiler.h"
>140a142
>> +#include "nsIDocument.h"
>143c145
><  #include "GeckoProfiler.h"
>---
>> -#include "GeckoProfiler.h"
>149c151,154
>< @@ -70,18 +72,20 @@ CollectRestyles(nsISupports* aElement,
>---
>>    return mRestyleManager->PresContext()->Document();
>>  }
>>  
>> @@ -74,18 +77,20 @@ CollectRestyles(nsISupports* aElement,
>163c168
>< +                   ->GetDisplayContents(element))) ||
>---
>> +                   ->GetDisplayContentsStyleFor(element))) ||
>170c175
><                 (aData.mChangeHint & nsChangeHint_ReconstructFrame),
>---
>>                 (aData->mChangeHint & nsChangeHint_ReconstructFrame),
>175c180
>< @@ -601,40 +601,16 @@ FindFirstNonBlock(const nsFrameList& aLi
>---
>> @@ -606,40 +606,16 @@ FindFirstNonBlock(const nsFrameList& aLi
>216c221
>< @@ -2252,18 +2228,19 @@ NeedFrameFor(const nsFrameConstructorSta
>---
>> @@ -2283,18 +2259,19 @@ NeedFrameFor(const nsFrameConstructorSta
>219c224
><    // We could handle all this in CreateNeededTablePseudos or some other place
>---
>>    // We could handle all this in CreateNeededPseudos or some other place
>238c243,263
>< @@ -3652,29 +3629,32 @@ nsCSSFrameConstructor::ConstructFrameFro
>---
>> @@ -2583,17 +2560,18 @@ nsCSSFrameConstructor::ConstructDocEleme
>>      // if the document is a table then just populate it.
>>      contentFrame = static_cast<nsContainerFrame*>(
>>        ConstructTable(state, item, mDocElementContainingBlock,
>>                       styleContext->StyleDisplay(),
>>                       frameItems));
>>      newFrame = frameItems.FirstChild();
>>      NS_ASSERTION(frameItems.OnlyChild(), "multiple root element frames");
>>    } else {
>> -    MOZ_ASSERT(display->mDisplay == NS_STYLE_DISPLAY_BLOCK,
>> +    MOZ_ASSERT(display->mDisplay == NS_STYLE_DISPLAY_BLOCK ||
>> +               display->mDisplay == NS_STYLE_DISPLAY_CONTENTS,
>>                 "Unhandled display type for root element");
>>      contentFrame = NS_NewBlockFormattingContext(mPresShell, styleContext);
>>      nsFrameItems frameItems;
>>      // Use a null PendingBinding, since our binding is not in fact pending.
>>      ConstructBlock(state, display, aDocElement,
>>                     state.GetGeometricParent(display,
>>                                              mDocElementContainingBlock),
>>                     mDocElementContainingBlock, styleContext,
>> @@ -3690,29 +3668,31 @@ nsCSSFrameConstructor::ConstructFrameFro
>254,255c279
>< +                                         aState.mPresContext,
>< +                                         parent);
>---
>> +                                         aState.mPresContext, parent);
>275c299
>< @@ -3690,16 +3670,18 @@ nsCSSFrameConstructor::ConstructFrameFro
>---
>> @@ -3728,16 +3708,18 @@ nsCSSFrameConstructor::ConstructFrameFro
>294c318,338
>< @@ -4563,17 +4545,19 @@ nsCSSFrameConstructor::FindDisplayData(c
>---
>> @@ -4494,17 +4476,18 @@ nsCSSFrameConstructor::FindDisplayData(c
>>                                         nsStyleContext* aStyleContext)
>>  {
>>    PR_STATIC_ASSERT(eParentTypeCount < (1 << (32 - FCDATA_PARENT_TYPE_OFFSET)));
>>  
>>    // The style system ensures that floated and positioned frames are
>>    // block-level.
>>    NS_ASSERTION(!(aDisplay->IsFloatingStyle() ||
>>                   aDisplay->IsAbsolutelyPositionedStyle()) ||
>> -               aDisplay->IsBlockOutsideStyle(),
>> +               aDisplay->IsBlockOutsideStyle() ||
>> +               aDisplay->mDisplay == NS_STYLE_DISPLAY_CONTENTS,
>>                 "Style system did not apply CSS2.1 section 9.7 fixups");
>>  
>>    // If this is "body", try propagating its scroll style to the viewport
>>    // Note that we need to do this even if the body is NOT scrollable;
>>    // it might have dynamically changed from scrollable to not scrollable,
>>    // and that might need to be propagated.
>>    // XXXbz is this the right place to do this?  If this code moves,
>>    // make this function static.
>> @@ -4635,19 +4618,26 @@ nsCSSFrameConstructor::FindDisplayData(c
>308a353,357
>> +  // 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");
>> +
>315c364,366
>< @@ -4682,31 +4666,32 @@ nsCSSFrameConstructor::InitAndRestoreFra
>---
>>  nsCSSFrameConstructor::ConstructScrollableBlock(nsFrameConstructorState& aState,
>>                                                  FrameConstructionItem&   aItem,
>> @@ -4754,31 +4744,32 @@ nsCSSFrameConstructor::InitAndRestoreFra
>341c392
>< +  nsStyleContext* parentStyleContext = GetDisplayContents(container);
>---
>> +  nsStyleContext* parentStyleContext = GetDisplayContentsStyleFor(container);
>363c414
>< @@ -5202,22 +5187,20 @@ nsCSSFrameConstructor::AddPageBreakItem(
>---
>> @@ -5289,22 +5280,20 @@ nsCSSFrameConstructor::AddPageBreakItem(
>389c440
>< @@ -5228,48 +5211,77 @@ nsCSSFrameConstructor::AddFrameConstruct
>---
>> @@ -5315,50 +5304,79 @@ nsCSSFrameConstructor::AddFrameConstruct
>459,460c510,511
>< +  
>< +void
>---
>>  
>>  void
>476,478c527,530
><  
><  /* static */ void
><  nsCSSFrameConstructor::SetAsUndisplayedContent(FrameConstructionItemList& aList,
>---
>> +
>> +void
>>  nsCSSFrameConstructor::SetAsUndisplayedContent(nsFrameConstructorState& aState,
>>                                                 FrameConstructionItemList& aList,
>484c536,537
>< @@ -5464,16 +5476,81 @@ nsCSSFrameConstructor::AddFrameConstruct
>---
>>      if (aIsGeneratedContent) {
>> @@ -5557,16 +5575,76 @@ nsCSSFrameConstructor::AddFrameConstruct
>494,502c547,550
>< +    if (!GetDisplayContents(aContent)) {
>< +      if (styleContext->GetPseudo()) {
>< +        if (isGeneratedContent) {
>< +          aContent->UnbindFromTree();
>< +        }
>< +      } else {
>< +        MOZ_ASSERT(!isGeneratedContent, "Should have had pseudo type");
>< +        aState.mFrameManager->SetDisplayContents(aContent, styleContext);
>< +      }
>---
>> +    if (!GetDisplayContentsStyleFor(aContent)) {
>> +      MOZ_ASSERT(styleContext->GetPseudo() || !isGeneratedContent,
>> +                 "Should have had pseudo type");
>> +      aState.mFrameManager->SetDisplayContents(aContent, styleContext);
>566c614
>< @@ -5826,31 +5903,76 @@ nsCSSFrameConstructor::GetFloatContainin
>---
>> @@ -5919,31 +5997,76 @@ nsCSSFrameConstructor::GetFloatContainin
>591c639,640
>< +  if (nsLayoutUtils::HasPseudoStyle(aContainer, aParentFrame->StyleContext(),
>---
>> +  if (GetGenConPseudos(aParentFrame) ||
>> +      nsLayoutUtils::HasPseudoStyle(aContainer, aParentFrame->StyleContext(),
>599,600c648
>< +      GetGenConPseudos(aParentFrame) ||
>< +      aFrameManager->GetDisplayContents(aContainer)) {
>---
>> +      aFrameManager->GetDisplayContentsStyleFor(aContainer)) {
>653c701
>< @@ -6221,17 +6343,18 @@ nsCSSFrameConstructor::GetInsertionPrevS
>---
>> @@ -6314,17 +6437,18 @@ nsCSSFrameConstructor::GetInsertionPrevS
>663c711
>< +  const bool boxContents = GetDisplayContents(aContainer);
>---
>> +  const bool boxContents = GetDisplayContentsStyleFor(aContainer);
>673c721
>< @@ -6251,29 +6374,35 @@ nsCSSFrameConstructor::GetInsertionPrevS
>---
>> @@ -6344,29 +6468,35 @@ nsCSSFrameConstructor::GetInsertionPrevS
>714c762
>< @@ -6281,27 +6410,57 @@ nsCSSFrameConstructor::GetInsertionPrevS
>---
>> @@ -6374,27 +6504,57 @@ nsCSSFrameConstructor::GetInsertionPrevS
>743c791
>< +    if (GetDisplayContents(aContent)) {
>---
>> +    if (GetDisplayContentsStyleFor(aContent)) {
>775c823
>< @@ -6428,16 +6587,20 @@ nsCSSFrameConstructor::MaybeConstructLaz
>---
>> @@ -6522,16 +6682,20 @@ nsCSSFrameConstructor::MaybeConstructLaz
>785c833
>< +    if (GetDisplayContents(content)) {
>---
>> +    if (GetDisplayContentsStyleFor(content)) {
>796c844
>< @@ -6550,18 +6713,18 @@ void
>---
>> @@ -6644,18 +6808,18 @@ void
>808c856
>< +         GetDisplayContents(child))
>---
>> +         GetDisplayContentsStyleFor(child))
>817c865
>< @@ -6710,17 +6873,17 @@ nsCSSFrameConstructor::ContentAppended(n
>---
>> @@ -6807,17 +6971,17 @@ nsCSSFrameConstructor::ContentAppended(n
>836c884
>< @@ -6783,19 +6946,18 @@ nsCSSFrameConstructor::ContentAppended(n
>---
>> @@ -6880,19 +7044,18 @@ nsCSSFrameConstructor::ContentAppended(n
>858,859c906,907
>< @@ -7143,26 +7305,27 @@ nsCSSFrameConstructor::ContentRangeInser
><      // the children of the host.
>---
>> @@ -7244,26 +7407,27 @@ nsCSSFrameConstructor::ContentRangeInser
>>      //XXXsmaug This is super unefficient!
>879c927
>< +               GetDisplayContents(aContainer), "New XBL code is possibly wrong!");
>---
>> +               GetDisplayContentsStyleFor(aContainer), "New XBL code is possibly wrong!");
>888c936
>< @@ -7439,20 +7602,19 @@ nsCSSFrameConstructor::ContentRangeInser
>---
>> @@ -7540,20 +7704,19 @@ nsCSSFrameConstructor::ContentRangeInser
>911c959
>< @@ -7582,28 +7744,42 @@ nsCSSFrameConstructor::ContentRemoved(ns
>---
>> @@ -7683,28 +7846,42 @@ nsCSSFrameConstructor::ContentRemoved(ns
>933c981
>< +  MOZ_ASSERT(!childFrame || !GetDisplayContents(aChild),
>---
>> +  MOZ_ASSERT(!childFrame || !GetDisplayContentsStyleFor(aChild),
>935c983
>< +  if (!childFrame && GetDisplayContents(aChild)) {
>---
>> +  if (!childFrame && GetDisplayContentsStyleFor(aChild)) {
>938c986
>< +      if (c->GetPrimaryFrame() || GetDisplayContents(c)) {
>---
>> +      if (c->GetPrimaryFrame() || GetDisplayContentsStyleFor(c)) {
>960c1008
>< @@ -8429,17 +8605,17 @@ nsCSSFrameConstructor::GetInsertionPoint
>---
>> @@ -8540,25 +8717,25 @@ nsCSSFrameConstructor::GetInsertionPoint
>972a1021,1029
>>      if (nsContentUtils::HasDistributedChildren(aContainer)) {
>>        // The container distributes nodes, use the frame of the flattened tree parent.
>>        // It may be the case that the node is distributed but not matched to any
>>        // insertion points, so there is no flattened parent.
>>        nsIContent* flattenedParent = aChildContent->GetFlattenedTreeParent();
>> -      return flattenedParent ? ::GetContentInsertionFrameFor(flattenedParent) : nullptr;
>> +      return flattenedParent ? GetContentInsertionFrameFor(flattenedParent) : nullptr;
>>      }
>>  
>976,979c1033,1036
><      bool multiple;
><      insertionElement = bindingManager->FindNestedSingleInsertionPoint(aContainer, &multiple);
><  
>< @@ -8450,18 +8626,17 @@ nsCSSFrameConstructor::GetInsertionPoint
>---
>>      if (nsContentUtils::HasDistributedChildren(aContainer)) {
>>        // The container distributes nodes to shadow DOM insertion points.
>>        // Return with aMultiple set to true to induce callers to insert children
>> @@ -8577,18 +8754,17 @@ nsCSSFrameConstructor::GetInsertionPoint
>1036c1093
>< @@ -566,16 +583,20 @@ private:
>---
>> @@ -587,16 +604,20 @@ private:
>1057c1114
>< @@ -1736,16 +1757,22 @@ private:
>---
>> @@ -1757,16 +1778,22 @@ private:
>1068c1125
>< +   * ancestor that isn't display-box:contents.
>---
>> +   * ancestor that isn't display:contents.

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