Merge 98492 - REGRESSION (r94887): Scrolling the HTML spec is more jerky now than it was (regress...

Source/WebCore/rendering/style/RenderStyle.h

Index: Source/WebCore/rendering/style/RenderStyle.h
===================================================================
--- Source/WebCore/rendering/style/RenderStyle.h	(revision 98492)
+++ Source/WebCore/rendering/style/RenderStyle.h	(working copy)
@@ -138,11 +138,11 @@
     // *-child-of-type, we will just give up and re-evaluate whenever children change at all.
     bool m_childrenAffectedByFirstChildRules : 1;
     bool m_childrenAffectedByLastChildRules : 1;
+    bool m_childrenAffectedByDirectAdjacentRules : 1;
     bool m_childrenAffectedByForwardPositionalRules : 1;
     bool m_childrenAffectedByBackwardPositionalRules : 1;
     bool m_firstChildState : 1;
     bool m_lastChildState : 1;
-    bool m_affectedByDirectAdjacentRules : 1;
     unsigned m_childIndex : 21; // Plenty of bits to cache an index.
 
     // non-inherited attributes
@@ -1313,9 +1313,6 @@
     bool affectedByUncommonAttributeSelectors() const { return m_affectedByUncommonAttributeSelectors; }
     void setAffectedByUncommonAttributeSelectors() { m_affectedByUncommonAttributeSelectors = true; }
 
-    bool affectedByDirectAdjacentRules() const { return m_affectedByDirectAdjacentRules; }
-    void setAffectedByDirectAdjacentRules() { m_affectedByDirectAdjacentRules = true; }
-
     bool unique() const { return m_unique; }
     void setUnique() { m_unique = true; }
 
@@ -1328,6 +1325,8 @@
     void setChildrenAffectedByFirstChildRules() { m_childrenAffectedByFirstChildRules = true; }
     bool childrenAffectedByLastChildRules() const { return m_childrenAffectedByLastChildRules; }
     void setChildrenAffectedByLastChildRules() { m_childrenAffectedByLastChildRules = true; }
+    bool childrenAffectedByDirectAdjacentRules() const { return m_childrenAffectedByDirectAdjacentRules; }
+    void setChildrenAffectedByDirectAdjacentRules() { m_childrenAffectedByDirectAdjacentRules = true; }
     bool childrenAffectedByForwardPositionalRules() const { return m_childrenAffectedByForwardPositionalRules; }
     void setChildrenAffectedByForwardPositionalRules() { m_childrenAffectedByForwardPositionalRules = true; }
     bool childrenAffectedByBackwardPositionalRules() const { return m_childrenAffectedByBackwardPositionalRules; }