Attachment 8492597 Details for Bug 907396

[patch] Implement RestyleUndisplayedDescendants that restyles diplay:none children and display:contents descendants.

907396-display-contents-RestyleDisplayNoneOrContentsChildren (text/plain), 14.14 KB, created by Mats Palmgren (inactive)

(hide)

Description:

Filename:

MIME Type:

Creator: Mats Palmgren (inactive)

Size: 14.14 KB

patch

obsolete

># HG changeset patch
># Parent 3c459e861185bbc4d8b7dc23f6401dccb84821fe
># User Mats Palmgren <matspal@gmail.com>
>Bug 907396 - Implement RestyleUndisplayedDescendants that restyles diplay:none children and display:contents descendants.  r=bzbarsky
>
>diff --git a/layout/base/RestyleManager.cpp b/layout/base/RestyleManager.cpp
>--- a/layout/base/RestyleManager.cpp
>+++ b/layout/base/RestyleManager.cpp
>@@ -2521,17 +2521,24 @@ ElementRestyler::Restyle(nsRestyleHint a
>     oldContext = nullptr;
>   }
> 
>   if (result == eRestyleResult_ContinueAndForceDescendants) {
>     childRestyleHint =
>       nsRestyleHint(childRestyleHint | eRestyle_ForceDescendants);
>   }
> 
>-  RestyleChildren(childRestyleHint);
>+  // No need to do this if we're planning to reframe already.
>+  // It's also important to check mHintsHandled since we use
>+  // mFrame->StyleContext(), which is out of date if mHintsHandled
>+  // has a ReconstructFrame hint.  Using an out of date style
>+  // context could trigger assertions about mismatched rule trees.
>+  if (!(mHintsHandled & nsChangeHint_ReconstructFrame)) {
>+    RestyleChildren(childRestyleHint);
>+  }
> 
>   if (oldContext && !oldContext->HasSingleReference()) {
>     // If we swapped some structs out of oldContext in the RestyleSelf call
>     // and after the RestyleChildren call we still have other strong references
>     // to it, we need to make ensure its descendants don't cached any of the
>     // structs that were swapped out.
>     //
>     // Most of the time we will not get in here; we do for example when the
>@@ -3026,31 +3033,34 @@ ElementRestyler::RestyleSelf(nsIFrame* a
>   }
> 
>   return result;
> }
> 
> void
> ElementRestyler::RestyleChildren(nsRestyleHint aChildRestyleHint)
> {
>+  MOZ_ASSERT(!(mHintsHandled & nsChangeHint_ReconstructFrame),
>+             "No need to do this if we're planning to reframe already.");
>+
>   // We'd like style resolution to be exact in the sense that an
>   // animation-only style flush flushes only the styles it requests
>   // flushing and doesn't update any other styles.  This means avoiding
>   // constructing new frames during such a flush.
>   //
>   // For a ::before or ::after, we'll do an eRestyle_Subtree due to
>   // RestyleHintForOp in nsCSSRuleProcessor.cpp (via its
>   // HasAttributeDependentStyle or HasStateDependentStyle), given that
>   // we store pseudo-elements in selectors like they were children.
>   //
>   // Also, it's faster to skip the work we do on undisplayed children
>   // and pseudo-elements when we can skip it.
>   bool mightReframePseudos = aChildRestyleHint & eRestyle_Subtree;
> 
>-  RestyleUndisplayedChildren(aChildRestyleHint);
>+  RestyleUndisplayedDescendants(aChildRestyleHint);
> 
>   // Check whether we might need to create a new ::before frame.
>   // There's no need to do this if we're planning to reframe already
>   // or if we're not forcing restyles on kids.
>   // It's also important to check mHintsHandled since we use
>   // mFrame->StyleContext(), which is out of date if mHintsHandled has a
>   // ReconstructFrame hint.  Using an out of date style context could
>   // trigger assertions about mismatched rule trees.
>@@ -3085,107 +3095,125 @@ ElementRestyler::RestyleChildren(nsResty
>   // See comments above regarding :before.
>   if (!(mHintsHandled & nsChangeHint_ReconstructFrame) &&
>       mightReframePseudos) {
>     MaybeReframeForAfterPseudo(lastContinuation);
>   }
> }
> 
> void
>-ElementRestyler::RestyleUndisplayedChildren(nsRestyleHint aChildRestyleHint)
>+ElementRestyler::RestyleUndisplayedDescendants(nsRestyleHint aChildRestyleHint)
> {
>   // When the root element is display:none, we still construct *some*
>   // frames that have the root element as their mContent, down to the
>   // DocElementContainingBlock.
>   bool checkUndisplayed;
>   nsIContent* undisplayedParent;
>-  nsCSSFrameConstructor* frameConstructor = mPresContext->FrameConstructor();
>   if (mFrame->StyleContext()->GetPseudo()) {
>-    checkUndisplayed = mFrame == frameConstructor->
>+    checkUndisplayed = mFrame == mPresContext->FrameConstructor()->
>                                    GetDocElementContainingBlock();
>     undisplayedParent = nullptr;
>   } else {
>     checkUndisplayed = !!mFrame->GetContent();
>     undisplayedParent = mFrame->GetContent();
>   }
>-  if (checkUndisplayed &&
>-      // No need to do this if we're planning to reframe already.
>-      // It's also important to check mHintsHandled since we use
>-      // mFrame->StyleContext(), which is out of date if mHintsHandled
>-      // has a ReconstructFrame hint.  Using an out of date style
>-      // context could trigger assertions about mismatched rule trees.
>-      !(mHintsHandled & nsChangeHint_ReconstructFrame)) {
>-    UndisplayedNode* undisplayed =
>-      frameConstructor->GetAllUndisplayedContentIn(undisplayedParent);
>-    TreeMatchContext::AutoAncestorPusher pusher(mTreeMatchContext);
>-    if (undisplayed) {
>-      pusher.PushAncestorAndStyleScope(undisplayedParent);
>+  if (checkUndisplayed) {
>+    DoRestyleUndisplayedDescendants(aChildRestyleHint, undisplayedParent);
>+  }
>+}
>+
>+void
>+ElementRestyler::DoRestyleUndisplayedDescendants(nsRestyleHint aChildRestyleHint,
>+                                                 nsIContent* aParent)
>+{
>+  nsCSSFrameConstructor* fc = mPresContext->FrameConstructor();
>+  UndisplayedNode* nodes = fc->GetAllUndisplayedContentIn(aParent);
>+  RestyleUndisplayedNodes(aChildRestyleHint, nodes, aParent,
>+                          NS_STYLE_DISPLAY_NONE);
>+  nodes = fc->GetAllDisplayContentsIn(aParent);
>+  RestyleUndisplayedNodes(aChildRestyleHint, nodes, aParent,
>+                          NS_STYLE_DISPLAY_CONTENTS);
>+}
>+
>+void
>+ElementRestyler::RestyleUndisplayedNodes(nsRestyleHint    aChildRestyleHint,
>+                                         UndisplayedNode* aUndisplayed,
>+                                         nsIContent*      aUndisplayedParent,
>+                                         const uint8_t    aDisplay)
>+{
>+  nsIContent* undisplayedParent = aUndisplayedParent;
>+  UndisplayedNode* undisplayed = aUndisplayed;
>+  TreeMatchContext::AutoAncestorPusher pusher(mTreeMatchContext);
>+  if (undisplayed) {
>+    pusher.PushAncestorAndStyleScope(undisplayedParent);
>+  }
>+  for (; undisplayed; undisplayed = undisplayed->mNext) {
>+    NS_ASSERTION(undisplayedParent ||
>+                 undisplayed->mContent ==
>+                   mPresContext->Document()->GetRootElement(),
>+                 "undisplayed node child of null must be root");
>+    NS_ASSERTION(!undisplayed->mStyle->GetPseudo(),
>+                 "Shouldn't have random pseudo style contexts in the "
>+                 "undisplayed map");
>+
>+    // Get the parent of the undisplayed content and check if it is a XBL
>+    // children element. Push the children element as an ancestor here because it does
>+    // not have a frame and would not otherwise be pushed as an ancestor.
>+    nsIContent* parent = undisplayed->mContent->GetParent();
>+    TreeMatchContext::AutoAncestorPusher insertionPointPusher(mTreeMatchContext);
>+    if (parent && nsContentUtils::IsContentInsertionPoint(parent)) {
>+      insertionPointPusher.PushAncestorAndStyleScope(parent);
>     }
>-    for (; undisplayed; undisplayed = undisplayed->mNext) {
>-      NS_ASSERTION(undisplayedParent ||
>-                   undisplayed->mContent ==
>-                     mPresContext->Document()->GetRootElement(),
>-                   "undisplayed node child of null must be root");
>-      NS_ASSERTION(!undisplayed->mStyle->GetPseudo(),
>-                   "Shouldn't have random pseudo style contexts in the "
>-                   "undisplayed map");
>-
>-      // Get the parent of the undisplayed content and check if it is a XBL
>-      // children element. Push the children element as an ancestor here because it does
>-      // not have a frame and would not otherwise be pushed as an ancestor.
>-      nsIContent* parent = undisplayed->mContent->GetParent();
>-      TreeMatchContext::AutoAncestorPusher insertionPointPusher(mTreeMatchContext);
>-      if (parent && nsContentUtils::IsContentInsertionPoint(parent)) {
>-        insertionPointPusher.PushAncestorAndStyleScope(parent);
>-      }
>-
>-      nsRestyleHint thisChildHint = aChildRestyleHint;
>-      nsAutoPtr<RestyleTracker::RestyleData> undisplayedRestyleData;
>-      Element* element = undisplayed->mContent->AsElement();
>-      if (mRestyleTracker.GetRestyleData(element,
>-                                         undisplayedRestyleData)) {
>-        thisChildHint =
>-          nsRestyleHint(thisChildHint | undisplayedRestyleData->mRestyleHint);
>-      }
>-      nsRefPtr<nsStyleContext> undisplayedContext;
>-      nsStyleSet* styleSet = mPresContext->StyleSet();
>-      if (thisChildHint & (eRestyle_Self | eRestyle_Subtree)) {
>-        undisplayedContext =
>-          styleSet->ResolveStyleFor(element,
>-                                    mFrame->StyleContext(),
>-                                    mTreeMatchContext);
>-      } else if (thisChildHint ||
>-                 styleSet->IsInRuleTreeReconstruct()) {
>-        // Use ResolveStyleWithReplacement either for actual
>-        // replacements, or as a substitute for ReparentStyleContext
>-        // that rebuilds the path in the rule tree rather than reusing
>-        // the rule node, as we need to do during a rule tree
>-        // reconstruct.
>-        undisplayedContext =
>-          styleSet->ResolveStyleWithReplacement(element,
>-                                                mFrame->StyleContext(),
>-                                                undisplayed->mStyle,
>-                                                thisChildHint);
>-      } else {
>-        undisplayedContext =
>-          styleSet->ReparentStyleContext(undisplayed->mStyle,
>-                                         mFrame->StyleContext(),
>-                                         element, element);
>-      }
>-      const nsStyleDisplay* display = undisplayedContext->StyleDisplay();
>-      if (display->mDisplay != NS_STYLE_DISPLAY_NONE) {
>-        NS_ASSERTION(undisplayed->mContent,
>-                     "Must have undisplayed content");
>-        mChangeList->AppendChange(nullptr, undisplayed->mContent,
>-                                  NS_STYLE_HINT_FRAMECHANGE);
>-        // The node should be removed from the undisplayed map when
>-        // we reframe it.
>-      } else {
>-        // update the undisplayed node with the new context
>-        undisplayed->mStyle = undisplayedContext;
>+
>+    nsRestyleHint thisChildHint = aChildRestyleHint;
>+    nsAutoPtr<RestyleTracker::RestyleData> undisplayedRestyleData;
>+    Element* element = undisplayed->mContent->AsElement();
>+    if (mRestyleTracker.GetRestyleData(element,
>+                                       undisplayedRestyleData)) {
>+      thisChildHint =
>+        nsRestyleHint(thisChildHint | undisplayedRestyleData->mRestyleHint);
>+    }
>+    nsRefPtr<nsStyleContext> undisplayedContext;
>+    nsStyleSet* styleSet = mPresContext->StyleSet();
>+    if (thisChildHint & (eRestyle_Self | eRestyle_Subtree)) {
>+      undisplayedContext =
>+        styleSet->ResolveStyleFor(element,
>+                                  mFrame->StyleContext(),
>+                                  mTreeMatchContext);
>+    } else if (thisChildHint ||
>+               styleSet->IsInRuleTreeReconstruct()) {
>+      // Use ResolveStyleWithReplacement either for actual
>+      // replacements, or as a substitute for ReparentStyleContext
>+      // that rebuilds the path in the rule tree rather than reusing
>+      // the rule node, as we need to do during a rule tree
>+      // reconstruct.
>+      undisplayedContext =
>+        styleSet->ResolveStyleWithReplacement(element,
>+                                              mFrame->StyleContext(),
>+                                              undisplayed->mStyle,
>+                                              thisChildHint);
>+    } else {
>+      undisplayedContext =
>+        styleSet->ReparentStyleContext(undisplayed->mStyle,
>+                                       mFrame->StyleContext(),
>+                                       element, element);
>+    }
>+    const nsStyleDisplay* display = undisplayedContext->StyleDisplay();
>+    if (display->mDisplay != aDisplay) {
>+      NS_ASSERTION(element, "Must have undisplayed content");
>+      mChangeList->AppendChange(nullptr, element,
>+                                NS_STYLE_HINT_FRAMECHANGE);
>+      // The node should be removed from the undisplayed map when
>+      // we reframe it.
>+    } else {
>+      // update the undisplayed node with the new context
>+      undisplayed->mStyle = undisplayedContext;
>+
>+      if (aDisplay == NS_STYLE_DISPLAY_CONTENTS) {
>+        DoRestyleUndisplayedDescendants(aChildRestyleHint, element);
>       }
>     }
>   }
> }
> 
> void
> ElementRestyler::MaybeReframeForBeforePseudo()
> {
>diff --git a/layout/base/RestyleManager.h b/layout/base/RestyleManager.h
>--- a/layout/base/RestyleManager.h
>+++ b/layout/base/RestyleManager.h
>@@ -20,16 +20,17 @@
> #include "nsCSSPseudoElements.h"
> 
> class nsIFrame;
> class nsStyleChangeList;
> struct TreeMatchContext;
> 
> namespace mozilla {
>   class EventStates;
>+  struct UndisplayedNode;
> 
> namespace dom {
>   class Element;
> } // namespace dom
> 
> class RestyleManager MOZ_FINAL
> {
> public:
>@@ -494,17 +495,23 @@ private:
>                      uint32_t* aEqualStructs);
>   RestyleResult ComputeRestyleResultFromFrame(nsIFrame* aSelf);
>   RestyleResult ComputeRestyleResultFromNewContext(nsIFrame* aSelf,
>                                                    nsStyleContext* aNewContext);
> 
>   /**
>    * Helpers for RestyleChildren().
>    */
>-  void RestyleUndisplayedChildren(nsRestyleHint aChildRestyleHint);
>+  void RestyleUndisplayedDescendants(nsRestyleHint aChildRestyleHint);
>+  void DoRestyleUndisplayedDescendants(nsRestyleHint aChildRestyleHint,
>+                                       nsIContent* aParent);
>+  void RestyleUndisplayedNodes(nsRestyleHint    aChildRestyleHint,
>+                               UndisplayedNode* aUndisplayed,
>+                               nsIContent*      aUndisplayedParent,
>+                               const uint8_t    aDisplay);
>   void MaybeReframeForBeforePseudo();
>   void MaybeReframeForAfterPseudo(nsIFrame* aFrame);
>   void RestyleContentChildren(nsIFrame* aParent,
>                               nsRestyleHint aChildRestyleHint);
>   void InitializeAccessibilityNotifications();
>   void SendAccessibilityNotifications();
> 
>   enum DesiredA11yNotifications {

Flags:

MatsPalmgren_bugz: review+

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