Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1181)

Unified Diff: Source/platform/graphics/paint/Transform3DDisplayItem.h

Issue 900653003: Avoid empty display item pairs (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix try bot breakage Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/platform/graphics/paint/Transform3DDisplayItem.h
diff --git a/Source/platform/graphics/paint/Transform3DDisplayItem.h b/Source/platform/graphics/paint/Transform3DDisplayItem.h
index 143d4bca93e7a3e8c72999233ee67302dd6ba4b7..6afce87a1b16f06939a860acc0a6e96a44d3953c 100644
--- a/Source/platform/graphics/paint/Transform3DDisplayItem.h
+++ b/Source/platform/graphics/paint/Transform3DDisplayItem.h
@@ -11,7 +11,7 @@
namespace blink {
-class PLATFORM_EXPORT BeginTransform3DDisplayItem : public DisplayItem {
+class PLATFORM_EXPORT BeginTransform3DDisplayItem : public PairedBeginDisplayItem {
WTF_MAKE_FAST_ALLOCATED;
public:
static PassOwnPtr<BeginTransform3DDisplayItem> create(DisplayItemClient client, const TransformationMatrix& transform)
@@ -20,7 +20,7 @@ public:
}
BeginTransform3DDisplayItem(DisplayItemClient client, const TransformationMatrix& transform)
- : DisplayItem(client, BeginTransform)
+ : PairedBeginDisplayItem(client, BeginTransform)
, m_transform(transform) { }
virtual void replay(GraphicsContext*) override;
@@ -31,7 +31,7 @@ private:
FloatPoint3D m_transformOrigin;
};
-class PLATFORM_EXPORT EndTransform3DDisplayItem : public DisplayItem {
+class PLATFORM_EXPORT EndTransform3DDisplayItem : public PairedEndDisplayItem {
WTF_MAKE_FAST_ALLOCATED;
public:
static PassOwnPtr<EndTransform3DDisplayItem> create(DisplayItemClient client)
@@ -40,10 +40,16 @@ public:
}
EndTransform3DDisplayItem(DisplayItemClient client)
- : DisplayItem(client, EndTransform) { }
+ : PairedEndDisplayItem(client, EndTransform) { }
virtual void replay(GraphicsContext*) override;
virtual void appendToWebDisplayItemList(WebDisplayItemList*) const override;
+
+private:
+#if ENABLE(ASSERT)
+ // FIXME: Distinguish BeginTransformDisplayItem and BeginTransform3DDisplayItem.
+ virtual bool isEndAndPairedWith(const DisplayItem& other) const override final { return other.type() == BeginTransform; }
+#endif
};
} // namespace blink
« no previous file with comments | « Source/platform/graphics/paint/ScrollDisplayItem.h ('k') | Source/platform/graphics/paint/TransformDisplayItem.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698