Switch to shorter names for property tree storage and updates

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

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc.
  *               All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 398 matching lines @@
   virtual bool createsAnonymousWrapper() const { return false; }
   //////////////////////////////////////////
 
   // Sets the parent of this object but doesn't add it as a child of the parent.
   void setDangerousOneWayParent(LayoutObject*);
 
   // For SPv2 only. The ObjectPaintProperties structure holds references to the
   // 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:
   //////////////////////////////////////////
   // Helper functions. Dangerous to use!
   void setPreviousSibling(LayoutObject* previous) { m_previous = previous; }
   void setNextSibling(LayoutObject* next) { m_next = next; }
   void setParent(LayoutObject* parent) {
     m_parent = parent;
 
     // Only update if our flow thread state is different from our new parent and
@@ skipping 1287 matching lines @@
       m_layoutObject.setPreviousBackgroundObscured(b);
     }
     void clearPreviousPaintInvalidationRects() {
       m_layoutObject.clearPreviousPaintInvalidationRects();
     }
 
    protected:
     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;
     MutableForPainting(const LayoutObject& layoutObject)
         : m_layoutObject(const_cast<LayoutObject&>(layoutObject)) {}
 
     LayoutObject& m_layoutObject;
   };
   MutableForPainting getMutableForPainting() const {
     return MutableForPainting(*this);
@@ skipping 851 matching lines @@
 CORE_EXPORT void showLineTree(const blink::LayoutObject*);
 CORE_EXPORT void showLayoutTree(const blink::LayoutObject* object1);
 // We don't make object2 an optional parameter so that showLayoutTree
 // can be called from gdb easily.
 CORE_EXPORT void showLayoutTree(const blink::LayoutObject* object1,
                                 const blink::LayoutObject* object2);
 
 #endif
 
 #endif  // LayoutObject_h