Move LayoutBoxModelObject's PaintLayer member to rare paint data

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 399 matching lines @@
     if (rare_paint_data_)
       return rare_paint_data_->LocalBorderBoxProperties();
     return nullptr;
   }
 
   // The complete set of property nodes that should be used as a starting point
   // to paint contents of this LayoutObject.
   PropertyTreeState ContentsProperties() const;
 
  private:
-  RarePaintData& EnsureRarePaintData();
-  RarePaintData* GetRarePaintData() { return rare_paint_data_.get(); }
-
   //////////////////////////////////////////
   // Helper functions. Dangerous to use!
   void SetPreviousSibling(LayoutObject* previous) { previous_ = previous; }
   void SetNextSibling(LayoutObject* next) { next_ = next; }
   void SetParent(LayoutObject* parent) {
     parent_ = parent;
 
     // Only update if our flow thread state is different from our new parent and
     // if we're not a LayoutFlowThread.
     // A LayoutFlowThread is always considered to be inside itself, so it never
@@ skipping 1668 matching lines @@
     bitfields_.SetContainsInlineWithOutlineAndContinuation(b);
   }
 
   void SetOutlineMayBeAffectedByDescendants(bool b) {
     bitfields_.SetOutlineMayBeAffectedByDescendants(b);
   }
   void SetPreviousOutlineMayBeAffectedByDescendants(bool b) {
     bitfields_.SetPreviousOutlineMayBeAffectedByDescendants(b);
   }
 
+  RarePaintData& EnsureRarePaintData();
+  RarePaintData* GetRarePaintData() const { return rare_paint_data_.get(); }
+
  private:
   // Used only by applyFirstLineChanges to get a first line style based off of a
   // given new style, without accessing the cache.
   PassRefPtr<ComputedStyle> UncachedFirstLineStyle() const;
 
   // Adjusts a visual rect in the space of |m_visualRect| to be in the
   // space of the |paintInvalidationContainer|, if needed. They can be different
   // only if |paintInvalidationContainer| is a composited scroller.
   void AdjustVisualRectForCompositedScrolling(
       LayoutRect&,
@@ skipping 702 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