Switch LocalBorderBoxProperties to store raw pointers

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ObjectPaintProperties_h
 #define ObjectPaintProperties_h
 
 #include "core/CoreExport.h"
 #include "platform/geometry/LayoutPoint.h"
 #include "platform/graphics/paint/ClipPaintPropertyNode.h"
@@ skipping 11 matching lines @@
 
 // This class stores property tree related information associated with a LayoutObject.
 // Currently there are two groups of information:
 // 1. The set of property nodes created locally by this LayoutObject.
 // 2. [Optional] A suite of property nodes (PaintChunkProperties) and paint offset
 //    that can be used to paint the border box of this LayoutObject.
 class CORE_EXPORT ObjectPaintProperties {
     WTF_MAKE_NONCOPYABLE(ObjectPaintProperties);
     USING_FAST_MALLOC(ObjectPaintProperties);
 public:
-    struct LocalBorderBoxProperties;
-
     static std::unique_ptr<ObjectPaintProperties> create()
     {
         return wrapUnique(new ObjectPaintProperties());
     }
 
     // The hierarchy of the transform subtree created by a LayoutObject is as follows:
     // [ paintOffsetTranslation ]           Normally paint offset is accumulated without creating a node
     // |                                    until we see, for example, transform or position:fixed.
     // +---[ transform ]                    The space created by CSS transform.
     //     |                                This is the local border box space, see: LocalBorderBoxProperties below.
@@ skipping 21 matching lines @@
 
     // The hierarchy of the clip subtree created by a LayoutObject is as follows:
     // [ css clip ]
     // [ css clip fixed position]
     // |
     // +--- [ overflow clip ]
     const ClipPaintPropertyNode* cssClip() const { return m_cssClip.get(); }
     const ClipPaintPropertyNode* cssClipFixedPosition() const { return m_cssClipFixedPosition.get(); }
     const ClipPaintPropertyNode* overflowClip() const { return m_overflowClip.get(); }
 
-    // This is a complete set of property nodes that should be used as a starting point to paint
-    // this layout object. It is needed becauase some property inherits from the containing block,
-    // not painting parent, thus can't be derived in O(1) during paint walk.
-    // Note: If this layout object has transform or stacking-context effects, those are already
-    // baked into in the context here. However for properties that affects only children,
-    // for example, perspective and overflow clip, those should be applied by the painter
-    // at the right painting step.
-    struct LocalBorderBoxProperties {
-        LayoutPoint paintOffset;
-        GeometryPropertyTreeState geometryPropertyTreeState;
-        const ScrollPaintPropertyNode* scroll;
-    };
-    const LocalBorderBoxProperties* localBorderBoxProperties() const { return m_localBorderBoxProperties.get(); }
-    // 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; }
     void clearEffect() { m_effect = nullptr; }
     void clearCssClip() { m_cssClip = nullptr; }
     void clearCssClipFixedPosition() { m_cssClipFixedPosition = nullptr; }
     void clearOverflowClip() { m_overflowClip = nullptr; }
     void clearPerspective() { m_perspective = nullptr; }
     void clearSvgLocalToBorderBoxTransform() { m_svgLocalToBorderBoxTransform = nullptr; }
     void clearScrollTranslation() { m_scrollTranslation = nullptr; }
     void clearScrollbarPaintOffset() { m_scrollbarPaintOffset = nullptr; }
@@ skipping 12 matching lines @@
         DCHECK(!svgLocalToBorderBoxTransform()) << "SVG elements cannot scroll so there should never be both a scroll translation and an SVG local to border box transform.";
         return createOrUpdateProperty(m_scrollTranslation, std::forward<Args>(args)...);
     }
     template <typename... Args> TransformPaintPropertyNode* createOrUpdateScrollbarPaintOffset(Args&&... args) { return createOrUpdateProperty(m_scrollbarPaintOffset, std::forward<Args>(args)...); }
     template <typename... Args> ScrollPaintPropertyNode* createOrUpdateScroll(Args&&... args) { return createOrUpdateProperty(m_scroll, std::forward<Args>(args)...); }
     template <typename... Args> EffectPaintPropertyNode* createOrUpdateEffect(Args&&... args) { return createOrUpdateProperty(m_effect, std::forward<Args>(args)...); }
     template <typename... Args> ClipPaintPropertyNode* createOrUpdateCssClip(Args&&... args) { return createOrUpdateProperty(m_cssClip, std::forward<Args>(args)...); }
     template <typename... Args> ClipPaintPropertyNode* createOrUpdateCssClipFixedPosition(Args&&... args) { return createOrUpdateProperty(m_cssClipFixedPosition, std::forward<Args>(args)...); }
     template <typename... Args> ClipPaintPropertyNode* createOrUpdateOverflowClip(Args&&... args) { return createOrUpdateProperty(m_overflowClip, std::forward<Args>(args)...); }
 
+    // This is a complete set of property nodes that should be used as a starting point to paint
+    // this layout object. It is needed becauase some property inherits from the containing block,

[jbroman, 2016/09/21 15:23:17]

nit: s/becauase/because/

+    // not painting parent, thus can't be derived in O(1) during paint walk.
+    // Note: If this layout object has transform or stacking-context effects, those are already
+    // baked into in the context here. However for properties that affects only children,
+    // for example, perspective and overflow clip, those should be applied by the painter
+    // at the right painting step.
+    struct LocalBorderBoxProperties {
+        LayoutPoint paintOffset;
+        const TransformPaintPropertyNode* transform;
+        const ClipPaintPropertyNode* clip;
+        const EffectPaintPropertyNode* effect;
+        const ScrollPaintPropertyNode* scroll;
+    };
+
     void setLocalBorderBoxProperties(std::unique_ptr<LocalBorderBoxProperties> properties) { m_localBorderBoxProperties = std::move(properties); }
+    const LocalBorderBoxProperties* localBorderBoxProperties() const { return m_localBorderBoxProperties.get(); }
+
+    // ContentsProperties returns the same property tree state in localBorderBoxProperties
+    // but modified to be inside any clips and scrolls caused by this object. This
+    // GeometryPropertyTreeState is suitable as the destination for paint invalidation.
+    GeometryPropertyTreeState getContentsProperties() const;
 
 private:
     ObjectPaintProperties() { }
 
     template <typename PaintPropertyNode, typename... Args>
     PaintPropertyNode* createOrUpdateProperty(RefPtr<PaintPropertyNode>& field, Args&&... args)
     {
         if (field)
             field->update(std::forward<Args>(args)...);
         else
@@ skipping 13 matching lines @@
     RefPtr<TransformPaintPropertyNode> m_scrollTranslation;
     RefPtr<TransformPaintPropertyNode> m_scrollbarPaintOffset;
     RefPtr<ScrollPaintPropertyNode> m_scroll;
 
     std::unique_ptr<LocalBorderBoxProperties> m_localBorderBoxProperties;
 };
 
 } // namespace blink
 
 #endif // ObjectPaintProperties_h