Switch to shorter names for property tree storage and updates

third_party/WebKit/Source/core/layout/LayoutObject.h

Index: third_party/WebKit/Source/core/layout/LayoutObject.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.h b/third_party/WebKit/Source/core/layout/LayoutObject.h
index 4f8b434ff4238cd21d3a21f026aad80b845141cd..c4cf35150e68a740cc9b2c61775d1e1e8db32475 100644
--- a/third_party/WebKit/Source/core/layout/LayoutObject.h
+++ b/third_party/WebKit/Source/core/layout/LayoutObject.h
@@ -416,10 +416,10 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
   // property tree nodes that are created by the layout object for painting.
   // The property nodes are only updated during InUpdatePaintProperties phase
   // of the document lifecycle and shall remain immutable during other phases.
-  const ObjectPaintProperties* objectPaintProperties() const;
+  const ObjectPaintProperties* paintProperties() const;
 
  private:
-  ObjectPaintProperties& ensureObjectPaintProperties();
+  ObjectPaintProperties& ensurePaintProperties();
 
  private:
   //////////////////////////////////////////
@@ -1727,12 +1727,12 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
     friend class PaintPropertyTreeBuilder;
     // The following two functions can be called from PaintPropertyTreeBuilder
     // only.
-    ObjectPaintProperties& ensureObjectPaintProperties() {
-      return m_layoutObject.ensureObjectPaintProperties();
+    ObjectPaintProperties& ensurePaintProperties() {
+      return m_layoutObject.ensurePaintProperties();
     }
-    ObjectPaintProperties* objectPaintProperties() {
+    ObjectPaintProperties* paintProperties() {
       return const_cast<ObjectPaintProperties*>(
-          m_layoutObject.objectPaintProperties());
+          m_layoutObject.paintProperties());
     }
 
     friend class LayoutObject;