Bug 1389385 - Rearrange dirty noting to operate on the element rather than the parent. r=emilio

This will allow us to scope restyle roots more tightly.

MozReview-Commit-ID: 2t2lp5sKBHH

dom/base/Element.cpp

@@ -4201,34 +4201,36 @@ BitIsPropagated(const Element* aElement)
 #endif
 
 template<typename Traits>
-inline void NoteDescendants(Element* aElement)
+void
+NoteDirtyContent(nsIContent* aContent)
 {
-  if (!aElement->HasServoData()) {
+  if (nsIPresShell* shell = aContent->OwnerDoc()->GetShell()) {
+    shell->EnsureStyleFlush();
+  }
+
+  Element* parent = aContent->GetFlattenedTreeParentElementForStyle();
+  if (!parent || !parent->HasServoData()) {
     // The bits only apply to styled elements.
     return;
   }
 
-  Element* curr = aElement;
+  Element* curr = parent;
   while (curr && !Traits::HasBit(curr)) {
     Traits::SetBit(curr);
     curr = curr->GetFlattenedTreeParentElementForStyle();
   }
 
-  if (nsIPresShell* shell = aElement->OwnerDoc()->GetShell()) {
-    shell->EnsureStyleFlush();
-  }
-
-  MOZ_ASSERT(BitIsPropagated<Traits>(aElement));
+  MOZ_ASSERT(BitIsPropagated<Traits>(parent));
 }
 
 void
-Element::NoteDirtyDescendantsForServo()
+nsIContent::NoteDirtyForServo()
 {
-  NoteDescendants<DirtyDescendantsBit>(this);
+  NoteDirtyContent<DirtyDescendantsBit>(this);
 }
 
 void
-Element::NoteAnimationOnlyDirtyDescendantsForServo()
+nsIContent::NoteAnimationOnlyDirtyForServo()
 {
-  NoteDescendants<AnimationOnlyDirtyDescendantsBit>(this);
+  NoteDirtyContent<AnimationOnlyDirtyDescendantsBit>(this);
 }

dom/base/Element.h

@@ -468,9 +468,6 @@ public:
 
   Directionality GetComputedDirectionality() const;
 
-  inline Element* GetFlattenedTreeParentElement() const;
-  inline Element* GetFlattenedTreeParentElementForStyle() const;
-
   bool HasDirtyDescendantsForServo() const
   {
     MOZ_ASSERT(IsStyledByServo());
@@ -487,9 +484,6 @@ public:
     UnsetFlags(ELEMENT_HAS_DIRTY_DESCENDANTS_FOR_SERVO);
   }
 
-  void NoteDirtyDescendantsForServo();
-  void NoteAnimationOnlyDirtyDescendantsForServo();
-
   bool HasAnimationOnlyDirtyDescendantsForServo() const {
     MOZ_ASSERT(IsStyledByServo());
     return HasFlag(ELEMENT_HAS_ANIMATION_ONLY_DIRTY_DESCENDANTS_FOR_SERVO);

dom/base/ElementInlines.h

@@ -29,8 +29,11 @@ Element::UnregisterActivityObserver()
   OwnerDoc()->UnregisterActivityObserver(this);
 }
 
+} // namespace dom
+} // namespace mozilla
+
 inline Element*
-Element::GetFlattenedTreeParentElement() const
+nsINode::GetFlattenedTreeParentElement() const
 {
   nsINode* parentNode = GetFlattenedTreeParentNode();
   if MOZ_LIKELY(parentNode && parentNode->IsElement()) {
@@ -41,7 +44,7 @@ Element::GetFlattenedTreeParentElement() const
 }
 
 inline Element*
-Element::GetFlattenedTreeParentElementForStyle() const
+nsINode::GetFlattenedTreeParentElementForStyle() const
 {
   nsINode* parentNode = GetFlattenedTreeParentNodeForStyle();
   if MOZ_LIKELY(parentNode && parentNode->IsElement()) {
@@ -51,7 +54,4 @@ Element::GetFlattenedTreeParentElementForStyle() const
   return nullptr;
 }
 
-} // namespace dom
-} // namespace mozilla
-
 #endif // mozilla_dom_ElementInlines_h

dom/base/nsIContent.h

@@ -979,6 +979,10 @@ public:
   virtual void RemovePurple() = 0;
 
   virtual bool OwnedOnlyByTheDOMTree() { return false; }
+
+  void NoteDirtyForServo();
+  void NoteAnimationOnlyDirtyForServo();
+
 protected:
   /**
    * Hook for implementing GetID.  This is guaranteed to only be

dom/base/nsINode.h

@@ -942,6 +942,9 @@ public:
    */
   inline nsINode* GetFlattenedTreeParentNodeForStyle() const;
 
+  inline mozilla::dom::Element* GetFlattenedTreeParentElement() const;
+  inline mozilla::dom::Element* GetFlattenedTreeParentElementForStyle() const;
+
   /**
    * Get the parent nsINode for this node if it is an Element.
    * @return the parent node

layout/base/ServoRestyleManager.cpp

@@ -1251,9 +1251,7 @@ ServoRestyleManager::ContentStateChanged(nsIContent* aContent,
   EventStates previousState = aElement->StyleState() ^ aChangedBits;
   snapshot.AddState(previousState);
 
-  if (Element* parent = aElement->GetFlattenedTreeParentElementForStyle()) {
-    parent->NoteDirtyDescendantsForServo();
-  }
+  aElement->NoteDirtyForServo();
 
   if (restyleHint || changeHint) {
     Servo_NoteExplicitHints(aElement, restyleHint, changeHint);
@@ -1373,9 +1371,7 @@ ServoRestyleManager::TakeSnapshotForAttributeChange(Element* aElement,
     snapshot.AddOtherPseudoClassState(aElement);
   }
 
-  if (Element* parent = aElement->GetFlattenedTreeParentElementForStyle()) {
-    parent->NoteDirtyDescendantsForServo();
-  }
+  aElement->NoteDirtyForServo();
 }
 
 // For some attribute changes we must restyle the whole subtree:

layout/base/nsCSSFrameConstructor.cpp

@@ -7552,10 +7552,7 @@ nsCSSFrameConstructor::LazilyStyleNewChildRange(nsIContent* aStartChild,
 {
   for (nsIContent* child = aStartChild; child != aEndChild;
        child = child->GetNextSibling()) {
-    nsINode* parent = child->GetFlattenedTreeParent();
-    if (MOZ_LIKELY(parent) && parent->IsElement()) {
-      parent->AsElement()->NoteDirtyDescendantsForServo();
-    }
+    child->NoteDirtyForServo();
   }
 }
 

layout/style/ServoBindings.cpp

@@ -371,26 +371,17 @@ Gecko_UnsetNodeFlags(RawGeckoNodeBorrowed aNode, uint32_t aFlags)
 }
 
 void
-Gecko_SetOwnerDocumentNeedsStyleFlush(RawGeckoElementBorrowed aElement)
+Gecko_NoteDirtyElement(RawGeckoElementBorrowed aElement)
 {
   MOZ_ASSERT(NS_IsMainThread());
-  if (nsIPresShell* shell = aElement->OwnerDoc()->GetShell()) {
-    shell->EnsureStyleFlush();
-  }
+  const_cast<Element*>(aElement)->NoteDirtyForServo();
 }
 
 void
-Gecko_NoteDirtyDescendants(RawGeckoElementBorrowed aElement)
+Gecko_NoteAnimationOnlyDirtyElement(RawGeckoElementBorrowed aElement)
 {
   MOZ_ASSERT(NS_IsMainThread());
-  const_cast<Element*>(aElement)->NoteDirtyDescendantsForServo();
-}
-
-void
-Gecko_NoteAnimationOnlyDirtyDescendants(RawGeckoElementBorrowed aElement)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  const_cast<Element*>(aElement)->NoteAnimationOnlyDirtyDescendantsForServo();
+  const_cast<Element*>(aElement)->NoteAnimationOnlyDirtyForServo();
 }
 
 nsStyleContext*

layout/style/ServoBindings.h

@@ -386,9 +386,8 @@ nsStyleContentData::CounterFunction* Gecko_SetCounterFunction(
 uint32_t Gecko_GetNodeFlags(RawGeckoNodeBorrowed node);
 void Gecko_SetNodeFlags(RawGeckoNodeBorrowed node, uint32_t flags);
 void Gecko_UnsetNodeFlags(RawGeckoNodeBorrowed node, uint32_t flags);
-void Gecko_SetOwnerDocumentNeedsStyleFlush(RawGeckoElementBorrowed element);
-void Gecko_NoteDirtyDescendants(RawGeckoElementBorrowed element);
-void Gecko_NoteAnimationOnlyDirtyDescendants(RawGeckoElementBorrowed element);
+void Gecko_NoteDirtyElement(RawGeckoElementBorrowed element);
+void Gecko_NoteAnimationOnlyDirtyElement(RawGeckoElementBorrowed element);
 
 // Incremental restyle.
 // Also, we might want a ComputedValues to ComputedValues API for animations?