| Index: Source/core/platform/graphics/GraphicsLayer.h
|
| diff --git a/Source/core/platform/graphics/GraphicsLayer.h b/Source/core/platform/graphics/GraphicsLayer.h
|
| index 3324a54e4f0f981246cae02ea48dbff5a8d1ae8e..72206c30f2d891931431cb3a92570a1b100f3cc1 100644
|
| --- a/Source/core/platform/graphics/GraphicsLayer.h
|
| +++ b/Source/core/platform/graphics/GraphicsLayer.h
|
| @@ -49,15 +49,6 @@
|
| #include "public/platform/WebLayerScrollClient.h"
|
| #include "public/platform/WebSolidColorLayer.h"
|
|
|
| -enum LayerTreeAsTextBehaviorFlags {
|
| - LayerTreeAsTextBehaviorNormal = 0,
|
| - LayerTreeAsTextDebug = 1 << 0, // Dump extra debugging info like layer addresses.
|
| - LayerTreeAsTextIncludeVisibleRects = 1 << 1,
|
| - LayerTreeAsTextIncludeRepaintRects = 1 << 2,
|
| - LayerTreeAsTextIncludePaintingPhases = 1 << 3
|
| -};
|
| -typedef unsigned LayerTreeAsTextBehavior;
|
| -
|
| enum DebugIDSpecialValues {
|
| DebugIDNoPlatformLayer = -1,
|
| DebugIDNoCompositedLayer = -2
|
| @@ -389,7 +380,7 @@ public:
|
| void setContentsOrientation(CompositingCoordinatesOrientation orientation) { m_contentsOrientation = orientation; }
|
| CompositingCoordinatesOrientation contentsOrientation() const { return m_contentsOrientation; }
|
|
|
| - void dumpLayer(TextStream&, int indent = 0, LayerTreeAsTextBehavior = LayerTreeAsTextBehaviorNormal) const;
|
| + void dumpLayer(TextStream&, int indent = 0, LayerTreeFlags = LayerTreeNormal) const;
|
|
|
| void setShowDebugBorder(bool show) { m_showDebugBorder = show; }
|
| bool isShowingDebugBorder() const { return m_showDebugBorder; }
|
| @@ -417,7 +408,7 @@ public:
|
|
|
| // Return a string with a human readable form of the layer tree, If debug is true
|
| // pointers for the layers and timing data will be included in the returned string.
|
| - String layerTreeAsText(LayerTreeAsTextBehavior = LayerTreeAsTextBehaviorNormal) const;
|
| + String layerTreeAsText(LayerTreeFlags = LayerTreeNormal) const;
|
|
|
| // Return an estimate of the backing store memory cost (in bytes). May be incorrect for tiled layers.
|
| double backingStoreMemoryEstimate() const;
|
| @@ -489,8 +480,8 @@ protected:
|
|
|
| static void writeIndent(TextStream&, int indent);
|
|
|
| - void dumpProperties(TextStream&, int indent, LayerTreeAsTextBehavior) const;
|
| - void dumpAdditionalProperties(TextStream&, int /*indent*/, LayerTreeAsTextBehavior) const { }
|
| + void dumpProperties(TextStream&, int indent, LayerTreeFlags) const;
|
| + void dumpAdditionalProperties(TextStream&, int /*indent*/, LayerTreeFlags) const { }
|
|
|
| void getDebugBorderInfo(Color&, float& width) const;
|
|
|
|
|