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

Source/WebCore/rendering/style/RenderStyle.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 120 matching lines @@
     bool m_unique : 1;
 
     // Bits for dynamic child matching.
     bool m_affectedByEmpty : 1;
     bool m_emptyState : 1;
 
     // We optimize for :first-child and :last-child.  The other positional child selectors like nth-child or
     // *-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
     DataRef<StyleBoxData> m_box;
     DataRef<StyleVisualData> visual;
     DataRef<StyleBackgroundData> m_background;
     DataRef<StyleSurroundData> surround;
     DataRef<StyleRareNonInheritedData> rareNonInheritedData;
 
     // inherited attributes
@@ skipping 1150 matching lines @@
         return originalDisplay() == INLINE || originalDisplay() == INLINE_BLOCK
             || originalDisplay() == INLINE_BOX || originalDisplay() == INLINE_TABLE;
     }
 
     void setWritingMode(WritingMode v) { inherited_flags.m_writingMode = v; }
 
     // To tell if this style matched attribute selectors. This makes it impossible to share.
     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; }
 
     // Methods for indicating the style is affected by dynamic updates (e.g., children changing, our position changing in our sibling list, etc.)
     bool affectedByEmpty() const { return m_affectedByEmpty; }
     bool emptyState() const { return m_emptyState; }
     void setEmptyState(bool b) { m_affectedByEmpty = true; m_unique = true; m_emptyState = b; }
     bool childrenAffectedByPositionalRules() const { return childrenAffectedByForwardPositionalRules() || childrenAffectedByBackwardPositionalRules(); }
     bool childrenAffectedByFirstChildRules() const { return m_childrenAffectedByFirstChildRules; }
     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; }
     void setChildrenAffectedByBackwardPositionalRules() { m_childrenAffectedByBackwardPositionalRules = true; }
     bool firstChildState() const { return m_firstChildState; }
     void setFirstChildState() { m_unique = true; m_firstChildState = true; }
     bool lastChildState() const { return m_lastChildState; }
     void setLastChildState() { m_unique = true; m_lastChildState = true; }
     unsigned childIndex() const { return m_childIndex; }
     void setChildIndex(unsigned index) { m_unique = true; m_childIndex = index; }
@@ skipping 242 matching lines @@
 {
     if (compareEqual(rareInheritedData->textSizeAdjust, b))
         return false;
     rareInheritedData.access()->textSizeAdjust = b;
     return true;
 }
 
 } // namespace WebCore
 
 #endif // RenderStyle_h