| Index: Source/core/paint/ViewDisplayList.h
|
| diff --git a/Source/core/paint/ViewDisplayList.h b/Source/core/paint/ViewDisplayList.h
|
| index 854e1bb65dca6eb2c8c0fafadce332668bd903e5..22c5abe939b8bd00095b9102101c7ad54afc46f3 100644
|
| --- a/Source/core/paint/ViewDisplayList.h
|
| +++ b/Source/core/paint/ViewDisplayList.h
|
| @@ -32,35 +32,36 @@ public:
|
| DrawingPaintPhaseTextClip = 10,
|
| DrawingPaintPhaseMask = 11,
|
| DrawingPaintPhaseClippingMask = 12,
|
| - ClipLayerOverflowControls = 13,
|
| - ClipLayerBackground = 14,
|
| - ClipLayerParent = 15,
|
| - ClipLayerFilter = 16,
|
| - ClipLayerForeground = 17,
|
| - ClipLayerFragmentFloat = 18,
|
| - ClipLayerFragmentForeground = 19,
|
| - ClipLayerFragmentChildOutline = 20,
|
| - ClipLayerFragmentOutline = 21,
|
| - ClipLayerFragmentMask = 22,
|
| - ClipLayerFragmentClippingMask = 23,
|
| - ClipLayerFragmentParent = 24,
|
| - ClipLayerFragmentSelection = 25,
|
| - ClipLayerFragmentChildBlockBackgrounds = 26,
|
| - EndClip = 27,
|
| - BeginFilter = 28,
|
| - EndFilter = 29,
|
| - BeginTransparency = 30,
|
| - EndTransparency = 31,
|
| - ClipBoxChildBlockBackgrounds = 32,
|
| - ClipBoxFloat = 33,
|
| - ClipBoxForeground = 34,
|
| - ClipBoxChildOutlines = 35,
|
| - ClipBoxSelection = 36,
|
| - ClipBoxCollapsedTableBorders = 37,
|
| - ClipBoxTextClip = 38,
|
| - ClipBoxClippingMask = 39,
|
| - BeginTransform = 40,
|
| - EndTransform = 41
|
| + ClipLayerOverflowControls,
|
| + ClipLayerBackground,
|
| + ClipLayerParent,
|
| + ClipLayerFilter,
|
| + ClipLayerForeground,
|
| + ClipLayerFragmentFloat,
|
| + ClipLayerFragmentForeground,
|
| + ClipLayerFragmentChildOutline,
|
| + ClipLayerFragmentOutline,
|
| + ClipLayerFragmentMask,
|
| + ClipLayerFragmentClippingMask,
|
| + ClipLayerFragmentParent,
|
| + ClipLayerFragmentSelection,
|
| + ClipLayerFragmentChildBlockBackgrounds,
|
| + EndClip,
|
| + BeginFilter,
|
| + EndFilter,
|
| + TransparencyClip,
|
| + BeginTransparency,
|
| + EndTransparency,
|
| + ClipBoxChildBlockBackgrounds,
|
| + ClipBoxFloat,
|
| + ClipBoxForeground,
|
| + ClipBoxChildOutlines,
|
| + ClipBoxSelection,
|
| + ClipBoxCollapsedTableBorders,
|
| + ClipBoxTextClip,
|
| + ClipBoxClippingMask,
|
| + BeginTransform,
|
| + EndTransform
|
| };
|
|
|
| virtual ~DisplayItem() { }
|
| @@ -71,6 +72,8 @@ public:
|
| Type type() const { return m_id.type; }
|
| bool idsEqual(const DisplayItem& other) const { return m_id.renderer == other.m_id.renderer && m_id.type == other.m_id.type; }
|
|
|
| + static Type paintPhaseToClipType(PaintPhase);
|
| +
|
| #ifndef NDEBUG
|
| static WTF::String typeAsDebugString(DisplayItem::Type);
|
| static WTF::String rendererDebugString(const RenderObject*);
|
|
|