Refactor PropertyTreeState as GeometryPropertyTreeState

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

Index: third_party/WebKit/Source/core/paint/ObjectPaintProperties.h
diff --git a/third_party/WebKit/Source/core/paint/ObjectPaintProperties.h b/third_party/WebKit/Source/core/paint/ObjectPaintProperties.h
index 5d00ac196a7d61ac66c4c09a0cfbec2f716d65b5..026c5eceb156f1b8171764fc1aeddb19f4004363 100644
--- a/third_party/WebKit/Source/core/paint/ObjectPaintProperties.h
+++ b/third_party/WebKit/Source/core/paint/ObjectPaintProperties.h
@@ -9,8 +9,8 @@
 #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"
@@ -81,14 +81,14 @@ public:
     // 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; }