Refactor PropertyTreeState as GeometryPropertyTreeState

third_party/WebKit/Source/core/paint/ObjectPaintProperties.h

 // Copyright 2015 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 ObjectPaintProperties_h
 #define ObjectPaintProperties_h
 
 #include "core/CoreExport.h"
 #include "platform/geometry/LayoutPoint.h"
 #include "platform/graphics/paint/ClipPaintPropertyNode.h"
 #include "platform/graphics/paint/EffectPaintPropertyNode.h"
+#include "platform/graphics/paint/GeometryPropertyTreeState.h"
 #include "platform/graphics/paint/PaintChunkProperties.h"
-#include "platform/graphics/paint/PropertyTreeState.h"
 #include "platform/graphics/paint/ScrollPaintPropertyNode.h"
 #include "platform/graphics/paint/TransformPaintPropertyNode.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/RefPtr.h"
 #include <memory>
 
 namespace blink {
 
 // This class stores property tree related information associated with a LayoutObject.
@@ skipping 50 matching lines @@
 
     // This is a complete set of property nodes that should be used as a starting point to paint
     // this layout object. It is needed becauase some property inherits from the containing block,
     // not painting parent, thus can't be derived in O(1) during paint walk.
     // Note: If this layout object has transform or stacking-context effects, those are already
     // baked into in the context here. However for properties that affects only children,
     // for example, perspective and overflow clip, those should be applied by the painter
     // at the right painting step.
     struct LocalBorderBoxProperties {
         LayoutPoint paintOffset;
-        // TODO(pdr): Rename this GeometryPropertyTreeState because it does not contain scroll.
-        PropertyTreeState propertyTreeState;
+        GeometryPropertyTreeState geometryPropertyTreeState;
         const ScrollPaintPropertyNode* scroll;
     };
     const LocalBorderBoxProperties* localBorderBoxProperties() const { return m_localBorderBoxProperties.get(); }
-    // ContentsProperties is the PropertyTreeState state that is the same as in localBorderBoxProperties, except that it is inside
-    // any clips and scrolls caused by this object. This PropertyTreeState is suitable as the destination for paint invalidation.
-    void getContentsProperties(PropertyTreeState&) const;
+    // ContentsProperties is the GeometryPropertyTreeState that is the same as in
+    // localBorderBoxProperties, except that it is inside any clips and scrolls caused by this
+    // object. This GeometryPropertyTreeState is suitable as the destination for paint invalidation.
+    void getContentsProperties(GeometryPropertyTreeState&) const;
 
     void clearPaintOffsetTranslation() { m_paintOffsetTranslation = nullptr; }
     void clearTransform() { m_transform = nullptr; }
     void clearEffect() { m_effect = nullptr; }
     void clearCssClip() { m_cssClip = nullptr; }
     void clearCssClipFixedPosition() { m_cssClipFixedPosition = nullptr; }
     void clearOverflowClip() { m_overflowClip = nullptr; }
     void clearPerspective() { m_perspective = nullptr; }
     void clearSvgLocalToBorderBoxTransform() { m_svgLocalToBorderBoxTransform = nullptr; }
     void clearScrollTranslation() { m_scrollTranslation = nullptr; }
@@ skipping 47 matching lines @@
     RefPtr<TransformPaintPropertyNode> m_scrollTranslation;
     RefPtr<TransformPaintPropertyNode> m_scrollbarPaintOffset;
     RefPtr<ScrollPaintPropertyNode> m_scroll;
 
     std::unique_ptr<LocalBorderBoxProperties> m_localBorderBoxProperties;
 };
 
 } // namespace blink
 
 #endif // ObjectPaintProperties_h