Cleanup constants for layerTreeAsText.

Source/core/platform/graphics/GraphicsLayer.cpp

 /*
  * 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 723 matching lines @@
         }
     }
 }
 
 void GraphicsLayer::writeIndent(TextStream& ts, int indent)
 {
     for (int i = 0; i != indent; ++i)
         ts << "  ";
 }
 
-void GraphicsLayer::dumpLayer(TextStream& ts, int indent, LayerTreeAsTextBehavior behavior) const
+void GraphicsLayer::dumpLayer(TextStream& ts, int indent, LayerTreeFlags flags) const
 {
     writeIndent(ts, indent);
     ts << "(" << "GraphicsLayer";
 
-    if (behavior & LayerTreeAsTextDebug) {
+    if (flags & LayerTreeIncludesDebugInfo) {
         ts << " " << static_cast<void*>(const_cast<GraphicsLayer*>(this));
         ts << " \"" << m_name << "\"";
     }
 
     ts << "\n";
-    dumpProperties(ts, indent, behavior);
+    dumpProperties(ts, indent, flags);
     writeIndent(ts, indent);
     ts << ")\n";
 }
 
-void GraphicsLayer::dumpProperties(TextStream& ts, int indent, LayerTreeAsTextBehavior behavior) const
+void GraphicsLayer::dumpProperties(TextStream& ts, int indent, LayerTreeFlags flags) const
 {
     if (m_position != FloatPoint()) {
         writeIndent(ts, indent + 1);
         ts << "(position " << m_position.x() << " " << m_position.y() << ")\n";
     }
 
     if (m_boundsOrigin != FloatPoint()) {
         writeIndent(ts, indent + 1);
         ts << "(bounds origin " << m_boundsOrigin.x() << " " << m_boundsOrigin.y() << ")\n";
     }
@@ skipping 31 matching lines @@
     if (!m_contentsVisible) {
         writeIndent(ts, indent + 1);
         ts << "(contentsVisible " << m_contentsVisible << ")\n";
     }
 
     if (!m_backfaceVisibility) {
         writeIndent(ts, indent + 1);
         ts << "(backfaceVisibility " << (m_backfaceVisibility ? "visible" : "hidden") << ")\n";
     }
 
-    if (behavior & LayerTreeAsTextDebug) {
+    if (flags & LayerTreeIncludesDebugInfo) {
         writeIndent(ts, indent + 1);
         ts << "(";
         if (m_client)
             ts << "client " << static_cast<void*>(m_client);
         else
             ts << "no client";
         ts << ")\n";
     }
 
     if (m_backgroundColor.isValid() && m_backgroundColor != Color::transparent) {
@@ skipping 17 matching lines @@
         ts << "(childrenTransform ";
         ts << "[" << m_childrenTransform.m11() << " " << m_childrenTransform.m12() << " " << m_childrenTransform.m13() << " " << m_childrenTransform.m14() << "] ";
         ts << "[" << m_childrenTransform.m21() << " " << m_childrenTransform.m22() << " " << m_childrenTransform.m23() << " " << m_childrenTransform.m24() << "] ";
         ts << "[" << m_childrenTransform.m31() << " " << m_childrenTransform.m32() << " " << m_childrenTransform.m33() << " " << m_childrenTransform.m34() << "] ";
         ts << "[" << m_childrenTransform.m41() << " " << m_childrenTransform.m42() << " " << m_childrenTransform.m43() << " " << m_childrenTransform.m44() << "])\n";
     }
 
     if (m_replicaLayer) {
         writeIndent(ts, indent + 1);
         ts << "(replica layer";
-        if (behavior & LayerTreeAsTextDebug)
+        if (flags & LayerTreeIncludesDebugInfo)
             ts << " " << m_replicaLayer;
         ts << ")\n";
-        m_replicaLayer->dumpLayer(ts, indent + 2, behavior);
+        m_replicaLayer->dumpLayer(ts, indent + 2, flags);
     }
 
     if (m_replicatedLayer) {
         writeIndent(ts, indent + 1);
         ts << "(replicated layer";
-        if (behavior & LayerTreeAsTextDebug)
+        if (flags & LayerTreeIncludesDebugInfo)
             ts << " " << m_replicatedLayer;
         ts << ")\n";
     }
 
-    if (behavior & LayerTreeAsTextIncludeRepaintRects && repaintRectMap().contains(this) && !repaintRectMap().get(this).isEmpty()) {
+    if ((flags & LayerTreeIncludesRepaintRects) && repaintRectMap().contains(this) && !repaintRectMap().get(this).isEmpty()) {
         writeIndent(ts, indent + 1);
         ts << "(repaint rects\n";
         for (size_t i = 0; i < repaintRectMap().get(this).size(); ++i) {
             if (repaintRectMap().get(this)[i].isEmpty())
                 continue;
             writeIndent(ts, indent + 2);
             ts << "(rect ";
             ts << repaintRectMap().get(this)[i].x() << " ";
             ts << repaintRectMap().get(this)[i].y() << " ";
             ts << repaintRectMap().get(this)[i].width() << " ";
             ts << repaintRectMap().get(this)[i].height();
             ts << ")\n";
         }
         writeIndent(ts, indent + 1);
         ts << ")\n";
     }
 
-    if (behavior & LayerTreeAsTextIncludePaintingPhases && paintingPhase()) {
+    if ((flags & LayerTreeIncludesPaintingPhases) && paintingPhase()) {
         writeIndent(ts, indent + 1);
         ts << "(paintingPhases\n";
         if (paintingPhase() & GraphicsLayerPaintBackground) {
             writeIndent(ts, indent + 2);
             ts << "GraphicsLayerPaintBackground\n";
         }
         if (paintingPhase() & GraphicsLayerPaintForeground) {
             writeIndent(ts, indent + 2);
             ts << "GraphicsLayerPaintForeground\n";
         }
         if (paintingPhase() & GraphicsLayerPaintMask) {
             writeIndent(ts, indent + 2);
             ts << "GraphicsLayerPaintMask\n";
         }
         if (paintingPhase() & GraphicsLayerPaintOverflowContents) {
             writeIndent(ts, indent + 2);
             ts << "GraphicsLayerPaintOverflowContents\n";
         }
         if (paintingPhase() & GraphicsLayerPaintCompositedScroll) {
             writeIndent(ts, indent + 2);
             ts << "GraphicsLayerPaintCompositedScroll\n";
         }
         writeIndent(ts, indent + 1);
         ts << ")\n";
     }
 
-    dumpAdditionalProperties(ts, indent, behavior);
+    dumpAdditionalProperties(ts, indent, flags);
     
     if (m_children.size()) {
         writeIndent(ts, indent + 1);
         ts << "(children " << m_children.size() << "\n";
         
         unsigned i;
         for (i = 0; i < m_children.size(); i++)
-            m_children[i]->dumpLayer(ts, indent + 2, behavior);
+            m_children[i]->dumpLayer(ts, indent + 2, flags);
         writeIndent(ts, indent + 1);
         ts << ")\n";
     }
 }
 
-String GraphicsLayer::layerTreeAsText(LayerTreeAsTextBehavior behavior) const
+String GraphicsLayer::layerTreeAsText(LayerTreeFlags flags) const
 {
     TextStream ts;
 
-    dumpLayer(ts, 0, behavior);
+    dumpLayer(ts, 0, flags);
     return ts.release();
 }
 
 void GraphicsLayer::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
     MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Layers);
     info.addMember(m_children, "children");
     info.addMember(m_parent, "parent");
     info.addMember(m_maskLayer, "maskLayer");
     info.addMember(m_replicaLayer, "replicaLayer");
@@ skipping 423 matching lines @@
 }
 
 } // namespace WebCore
 
 #ifndef NDEBUG
 void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer)
 {
     if (!layer)
         return;
 
-    String output = layer->layerTreeAsText(LayerTreeAsTextDebug | LayerTreeAsTextIncludeVisibleRects);
+    String output = layer->layerTreeAsText(WebCore::LayerTreeIncludesDebugInfo);
     fprintf(stderr, "%s\n", output.utf8().data());
 }
 #endif