Cleanup constants for layerTreeAsText.

Source/core/platform/graphics/GraphicsLayer.h

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 31 matching lines @@
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 
 #include "public/platform/WebAnimationDelegate.h"
 #include "public/platform/WebCompositingReasons.h"
 #include "public/platform/WebContentLayer.h"
 #include "public/platform/WebImageLayer.h"
 #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
 };
 
 namespace WebKit {
 class GraphicsLayerFactoryChromium;
 class WebLayer;
 }
 
@@ skipping 311 matching lines @@
     
     // For hosting this GraphicsLayer in a native layer hierarchy.
     WebKit::WebLayer* platformLayer() const;
 
     enum CompositingCoordinatesOrientation { CompositingCoordinatesTopDown, CompositingCoordinatesBottomUp };
 
     // Flippedness of the contents of this layer. Does not affect sublayer geometry.
     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; }
 
     void setShowRepaintCounter(bool show) { m_showRepaintCounter = show; }
     bool isShowingRepaintCounter() const { return m_showRepaintCounter; }
 
     // FIXME: this is really a paint count.
     int repaintCount() const { return m_repaintCount; }
     int incrementRepaintCount() { return ++m_repaintCount; }
 
     void setDebugBackgroundColor(const Color&) { }
     void setDebugBorder(const Color&, float /*borderWidth*/) { }
 
     // z-position is the z-equivalent of position(). It's only used for debugging purposes.
     float zPosition() const { return m_zPosition; }
     void setZPosition(float);
 
     void distributeOpacity(float);
     float accumulatedOpacity() const;
 
     // If the exposed rect of this layer changes, returns true if this or descendant layers need a flush,
     // for example to allocate new tiles.
     bool visibleRectChangeRequiresFlush(const FloatRect& /* clipRect */) const { return false; }
 
     // 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;
 
     void resetTrackedRepaints();
     void addRepaintRect(const FloatRect&);
 
     static bool supportsBackgroundColorContent()
     {
         return false;
@@ skipping 51 matching lines @@
     // The layer being replicated.
     GraphicsLayer* replicatedLayer() const { return m_replicatedLayer; }
     void setReplicatedLayer(GraphicsLayer* layer) { m_replicatedLayer = layer; }
 
     // Any factory classes that want to create a GraphicsLayer need to be friends.
     friend class WebKit::GraphicsLayerFactoryChromium;
     explicit GraphicsLayer(GraphicsLayerClient*);
 
     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;
 
     // Helper functions used by settors to keep layer's the state consistent.
     void updateNames();
     void updateChildList();
     void updateLayerIsDrawable();
     void updateContentsRect();
 
     void setContentsTo(ContentsLayerPurpose, WebKit::WebLayer*);
@@ skipping 77 matching lines @@
 
 
 } // namespace WebCore
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer);
 #endif
 
 #endif // GraphicsLayer_h