Revert of Add StyleDifference::needsVisualRectUpdate

third_party/WebKit/Source/core/style/StyleDifference.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef StyleDifference_h
 #define StyleDifference_h
 
 #include "wtf/Allocator.h"
 #include "wtf/Assertions.h"
 
 namespace blink {
 
 class StyleDifference {
   STACK_ALLOCATED();
 
  public:
   enum PropertyDifference {
     TransformChanged = 1 << 0,
     OpacityChanged = 1 << 1,
     ZIndexChanged = 1 << 2,
     FilterChanged = 1 << 3,
     BackdropFilterChanged = 1 << 4,
     CSSClipChanged = 1 << 5,
     // The object needs to issue paint invalidations if it is affected by text
     // decorations or properties dependent on color (e.g., border or outline).
     TextDecorationOrColorChanged = 1 << 6,
-    ScrollAnchorDisablingPropertyChanged = 1 << 7,
     // If you add a value here, be sure to update the number of bits on
     // m_propertySpecificDifferences.
   };
 
   StyleDifference()
       : m_paintInvalidationType(NoPaintInvalidation),
         m_layoutType(NoLayout),
         m_recomputeOverflow(false),
-        m_visualRectUpdate(false),
-        m_propertySpecificDifferences(0) {}
+        m_propertySpecificDifferences(0),
+        m_scrollAnchorDisablingPropertyChanged(false) {}
 
   bool hasDifference() const {
-    return m_paintInvalidationType || m_layoutType ||
-           m_propertySpecificDifferences || m_recomputeOverflow ||
-           m_visualRectUpdate;
+    bool result = m_paintInvalidationType || m_layoutType ||
+                  m_propertySpecificDifferences;
+    // m_recomputeOverflow, m_scrollAnchorDisablingPropertyChanged and
+    // are never set without other flags set.
+    DCHECK(result ||
+           (!m_recomputeOverflow && !m_scrollAnchorDisablingPropertyChanged));
+    return result;
   }
 
   bool hasAtMostPropertySpecificDifferences(
       unsigned propertyDifferences) const {
     return !m_paintInvalidationType && !m_layoutType &&
            !(m_propertySpecificDifferences & ~propertyDifferences);
   }
 
   bool needsFullPaintInvalidation() const {
     return m_paintInvalidationType != NoPaintInvalidation;
@@ skipping 27 matching lines @@
     DCHECK(!needsFullLayout());
     m_layoutType = PositionedMovement;
   }
 
   bool needsFullLayout() const { return m_layoutType == FullLayout; }
   void setNeedsFullLayout() { m_layoutType = FullLayout; }
 
   bool needsRecomputeOverflow() const { return m_recomputeOverflow; }
   void setNeedsRecomputeOverflow() { m_recomputeOverflow = true; }
 
-  bool needsVisualRectUpdate() const { return m_visualRectUpdate; }
-  void setNeedsVisualRectUpdate() { m_visualRectUpdate = true; }
-
   bool transformChanged() const {
     return m_propertySpecificDifferences & TransformChanged;
   }
   void setTransformChanged() {
     m_propertySpecificDifferences |= TransformChanged;
   }
 
   bool opacityChanged() const {
     return m_propertySpecificDifferences & OpacityChanged;
   }
@@ skipping 22 matching lines @@
   void setCSSClipChanged() { m_propertySpecificDifferences |= CSSClipChanged; }
 
   bool textDecorationOrColorChanged() const {
     return m_propertySpecificDifferences & TextDecorationOrColorChanged;
   }
   void setTextDecorationOrColorChanged() {
     m_propertySpecificDifferences |= TextDecorationOrColorChanged;
   }
 
   bool scrollAnchorDisablingPropertyChanged() const {
-    return m_propertySpecificDifferences & ScrollAnchorDisablingPropertyChanged;
+    return m_scrollAnchorDisablingPropertyChanged;
   }
   void setScrollAnchorDisablingPropertyChanged() {
-    m_propertySpecificDifferences |= ScrollAnchorDisablingPropertyChanged;
+    m_scrollAnchorDisablingPropertyChanged = true;
   }
 
  private:
   enum PaintInvalidationType {
     NoPaintInvalidation,
     PaintInvalidationObject,
     PaintInvalidationSubtree,
   };
   unsigned m_paintInvalidationType : 2;
 
   enum LayoutType { NoLayout = 0, PositionedMovement, FullLayout };
   unsigned m_layoutType : 2;
   unsigned m_recomputeOverflow : 1;
-  unsigned m_visualRectUpdate : 1;
-  unsigned m_propertySpecificDifferences : 8;
+  unsigned m_propertySpecificDifferences : 7;
+  unsigned m_scrollAnchorDisablingPropertyChanged : 1;
 };
 
 }  // namespace blink
 
 #endif  // StyleDifference_h