Blink-side contiguous allocation of display items.

Source/platform/graphics/paint/ClipDisplayItem.h

 // Copyright 2014 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 ClipDisplayItem_h
 #define ClipDisplayItem_h
 
 #include "SkRegion.h"
 #include "platform/PlatformExport.h"
 #include "platform/geometry/FloatRoundedRect.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/paint/DisplayItem.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 class PLATFORM_EXPORT ClipDisplayItem : public PairedBeginDisplayItem {
-    WTF_MAKE_FAST_ALLOCATED(ClipDisplayItem);
 public:
-    static PassOwnPtr<ClipDisplayItem> create(const DisplayItemClientWrapper& client, Type type, const IntRect& clipRect, SkRegion::Op operation = SkRegion::kIntersect_Op)
-    {
-        return adoptPtr(new ClipDisplayItem(client, type, clipRect, operation));
-    }
-
-    ClipDisplayItem(const DisplayItemClientWrapper& client, Type type, const IntRect& clipRect, SkRegion::Op operation = SkRegion::kIntersect_Op)
+    ClipDisplayItem(const DisplayItemClientWrapper& client, Type type, const IntRect& clipRect, PassOwnPtr<Vector<FloatRoundedRect>> roundedRectClips)
         : PairedBeginDisplayItem(client, type)
         , m_clipRect(clipRect)
-        , m_operation(operation)
+        , m_roundedRectClips(roundedRectClips)
     {
         ASSERT(isClipType(type));
     }
 
+    ClipDisplayItem(const DisplayItemClientWrapper& client, Type type, const IntRect& clipRect, FloatRoundedRect roundedRectClip)
+        : ClipDisplayItem(client, type, clipRect, adoptPtr(new Vector<FloatRoundedRect>()))
+    {
+        m_roundedRectClips->append(roundedRectClip);
+    }
+
+    ClipDisplayItem(const DisplayItemClientWrapper& client, Type type, const IntRect& clipRect)
+        : ClipDisplayItem(client, type, clipRect, nullptr)
+    {
+    }
+
     virtual void replay(GraphicsContext&) override;
     virtual void appendToWebDisplayItemList(WebDisplayItemList*) const override;
-
-    Vector<FloatRoundedRect>& roundedRectClips() { return m_roundedRectClips; }
+    void appendByMoving(DisplayItems&) override;
 
 private:
 #ifndef NDEBUG
     virtual void dumpPropertiesAsDebugString(WTF::StringBuilder&) const override;
 #endif
     IntRect m_clipRect;
-    Vector<FloatRoundedRect> m_roundedRectClips;
-    SkRegion::Op m_operation;
+    OwnPtr<Vector<FloatRoundedRect>> m_roundedRectClips;
+    // TODO(pdr): Track SkRegion::Op.
 };
 
 class PLATFORM_EXPORT EndClipDisplayItem : public PairedEndDisplayItem {
-    WTF_MAKE_FAST_ALLOCATED(EndClipDisplayItem);
 public:
-    static PassOwnPtr<EndClipDisplayItem> create(const DisplayItemClientWrapper& client, Type type)
-    {
-        return adoptPtr(new EndClipDisplayItem(client, type));
-    }
-
     EndClipDisplayItem(const DisplayItemClientWrapper& client, Type type)
         : PairedEndDisplayItem(client, type)
     {
         ASSERT(isEndClipType(type));
     }
 
     virtual void replay(GraphicsContext&) override;
     virtual void appendToWebDisplayItemList(WebDisplayItemList*) const override;
+    void appendByMoving(DisplayItems&) override;
 
 private:
 #if ENABLE(ASSERT)
     virtual bool isEndAndPairedWith(DisplayItem::Type otherType) const override final { return DisplayItem::isClipType(otherType); }
 #endif
 };
 
 } // namespace blink
 
 #endif // ClipDisplayItem_h