| Index: Source/platform/graphics/paint/ClipDisplayItem.h
|
| diff --git a/Source/platform/graphics/paint/ClipDisplayItem.h b/Source/platform/graphics/paint/ClipDisplayItem.h
|
| index c065f0ec061a36dc84478545fc7df2eb362935a6..65c2754a49998a4ca2ec0a0e53851cdc10ecee6a 100644
|
| --- a/Source/platform/graphics/paint/ClipDisplayItem.h
|
| +++ b/Source/platform/graphics/paint/ClipDisplayItem.h
|
| @@ -18,15 +18,15 @@ 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)
|
| + static PassOwnPtr<ClipDisplayItem> create(const DisplayItemClientWrapper& client, Type type, const IntRect& clipRect, PassOwnPtr<Vector<FloatRoundedRect>> roundedRectClips = nullptr)
|
| {
|
| - return adoptPtr(new ClipDisplayItem(client, type, clipRect, operation));
|
| + return adoptPtr(new ClipDisplayItem(client, type, clipRect, roundedRectClips));
|
| }
|
|
|
| - 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 = nullptr)
|
| : PairedBeginDisplayItem(client, type)
|
| , m_clipRect(clipRect)
|
| - , m_operation(operation)
|
| + , m_roundedRectClips(roundedRectClips)
|
| {
|
| ASSERT(isClipType(type));
|
| }
|
| @@ -34,15 +34,12 @@ public:
|
| virtual void replay(GraphicsContext&) override;
|
| virtual void appendToWebDisplayItemList(WebDisplayItemList*) const override;
|
|
|
| - Vector<FloatRoundedRect>& roundedRectClips() { return m_roundedRectClips; }
|
| -
|
| 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;
|
| };
|
|
|
| class PLATFORM_EXPORT EndClipDisplayItem : public PairedEndDisplayItem {
|
|
|