Improve handling of PaintInvalidationLayer (renamed to PaintInvalidationSubtree)

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"
 
@@ skipping 27 matching lines @@
         return !m_paintInvalidationType && !m_layoutType && !(m_propertySpecificDifferences & ~propertyDifferences);
     }
 
     bool needsPaintInvalidation() const { return m_paintInvalidationType != NoPaintInvalidation; }
     void clearNeedsPaintInvalidation() { m_paintInvalidationType = NoPaintInvalidation; }
 
     // The object just needs to issue paint invalidations.
     bool needsPaintInvalidationObject() const { return m_paintInvalidationType == PaintInvalidationObject; }
     void setNeedsPaintInvalidationObject()
     {
-        ASSERT(!needsPaintInvalidationLayer());
+        ASSERT(!needsPaintInvalidationSubtree());
         m_paintInvalidationType = PaintInvalidationObject;
     }
 
-    // The layer and its descendant layers need to issue paint invalidations.
-    bool needsPaintInvalidationLayer() const { return m_paintInvalidationType == PaintInvalidationLayer; }
-    void setNeedsPaintInvalidationLayer() { m_paintInvalidationType = PaintInvalidationLayer; }
+    // The object and its descendants need to issue paint invalidations.
+    bool needsPaintInvalidationSubtree() const { return m_paintInvalidationType == PaintInvalidationSubtree; }
+    void setNeedsPaintInvalidationSubtree() { m_paintInvalidationType = PaintInvalidationSubtree; }
 
     bool needsLayout() const { return m_layoutType != NoLayout; }
     void clearNeedsLayout() { m_layoutType = NoLayout; }
 
     // The offset of this positioned object has been updated.
     bool needsPositionedMovementLayout() const { return m_layoutType == PositionedMovement; }
     void setNeedsPositionedMovementLayout()
     {
         ASSERT(!needsFullLayout());
         m_layoutType = PositionedMovement;
@@ skipping 20 matching lines @@
     bool backdropFilterChanged() const { return m_propertySpecificDifferences & BackdropFilterChanged; }
     void setBackdropFilterChanged() { m_propertySpecificDifferences |= BackdropFilterChanged; }
 
     bool textDecorationOrColorChanged() const { return m_propertySpecificDifferences & TextDecorationOrColorChanged; }
     void setTextDecorationOrColorChanged() { m_propertySpecificDifferences |= TextDecorationOrColorChanged; }
 
 private:
     enum PaintInvalidationType {
         NoPaintInvalidation = 0,
         PaintInvalidationObject,
-        PaintInvalidationLayer
+        PaintInvalidationSubtree
     };
     unsigned m_paintInvalidationType : 2;
 
     enum LayoutType {
         NoLayout = 0,
         PositionedMovement,
         FullLayout
     };
     unsigned m_layoutType : 2;
     unsigned m_recomputeOverflow : 1;
     unsigned m_propertySpecificDifferences : 6;
 };
 
 } // namespace blink
 
 #endif // StyleDifference_h