| 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 6ee0b9bdce6c9cb1861d67f1e2495f7034223b09..c9d07b84c4b590cb571bb8427aee78972bca9af3 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutObject.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutObject.h
|
| @@ -60,14 +60,15 @@ class Document;
|
| class HitTestLocation;
|
| class HitTestResult;
|
| class InlineBox;
|
| -class PseudoStyleRequest;
|
| class LayoutBoxModelObject;
|
| class LayoutBlock;
|
| class LayoutFlowThread;
|
| class LayoutGeometryMap;
|
| -class PaintLayer;
|
| class LayoutMultiColumnSpannerPlaceholder;
|
| class LayoutView;
|
| +class ObjectPaintProperties;
|
| +class PaintLayer;
|
| +class PseudoStyleRequest;
|
| class TransformState;
|
|
|
| struct PaintInfo;
|
| @@ -353,6 +354,12 @@ public:
|
| // Sets the parent of this object but doesn't add it as a child of the parent.
|
| void setDangerousOneWayParent(LayoutObject*);
|
|
|
| + // For SPv2 only. These are implemented as a global hash map temporarily,
|
| + // to avoid memory regression during the transition towards SPv2.
|
| + ObjectPaintProperties* objectPaintProperties() const;
|
| + ObjectPaintProperties& ensureObjectPaintProperties();
|
| + void clearObjectPaintProperties();
|
| +
|
| private:
|
| //////////////////////////////////////////
|
| // Helper functions. Dangerous to use!
|
|
|