1 files changed, 48 insertions, 40 deletions
diff --git a/Source/WebCore/platform/graphics/android/layers/DumpLayer.cpp b/Source/WebCore/platform/graphics/android/layers/DumpLayer.cpp
index 5551965..d827c44 100644
--- a/Source/WebCore/platform/graphics/android/layers/DumpLayer.cpp
+++ b/Source/WebCore/platform/graphics/android/layers/DumpLayer.cpp
@@ -3,79 +3,87 @@
 
 #if USE(ACCELERATED_COMPOSITING)
 
+#define WRITE_VAL(format, ...) (snprintf(m_valueBuffer, BUF_SIZE, format, __VA_ARGS__), writeEntry(label, m_valueBuffer))
+
 namespace WebCore {
 
-void lwrite(FILE* file, const char* str)
+void LayerDumper::writeIntVal(const char* label, int value)
 {
-    fwrite(str, sizeof(char), strlen(str), file);
+    WRITE_VAL("%d", value);
 }
 
-void writeIndent(FILE* file, int indentLevel)
+void LayerDumper::writeHexVal(const char* label, int value)
 {
-    if (indentLevel)
-        fprintf(file, "%*s", indentLevel*2, " ");
+    WRITE_VAL("%x", value);
 }
 
-void writeln(FILE* file, int indentLevel, const char* str)
+void LayerDumper::writeFloatVal(const char* label, float value)
 {
-    writeIndent(file, indentLevel);
-    lwrite(file, str);
-    lwrite(file, "\n");
+    WRITE_VAL("%.3f", value);
 }
 
-void writeIntVal(FILE* file, int indentLevel, const char* str, int value)
+void LayerDumper::writePoint(const char* label, SkPoint point)
 {
-    writeIndent(file, indentLevel);
-    fprintf(file, "%s = %d;\n", str, value);
+    WRITE_VAL("{ x = %.3f; y = %.3f; }", point.fX, point.fY);
 }
 
-void writeHexVal(FILE* file, int indentLevel, const char* str, int value)
+void LayerDumper::writeIntPoint(const char* label, IntPoint point)
 {
-    writeIndent(file, indentLevel);
-    fprintf(file, "%s = %x;\n", str, value);
+    WRITE_VAL("{ x = %d; y = %d; }", point.x(), point.y());
 }
 
-void writeFloatVal(FILE* file, int indentLevel, const char* str, float value)
+void LayerDumper::writeSize(const char* label, SkSize size)
 {
-    writeIndent(file, indentLevel);
-    fprintf(file, "%s = %.3f;\n", str, value);
+    WRITE_VAL("{ w = %.3f; h = %.3f; }", size.width(), size.height());
 }
 
-void writePoint(FILE* file, int indentLevel, const char* str, SkPoint point)
+void LayerDumper::writeRect(const char* label, SkRect rect)
 {
-    writeIndent(file, indentLevel);
-    fprintf(file, "%s = { x = %.3f; y = %.3f; };\n", str, point.fX, point.fY);
+    WRITE_VAL("{ x = %.3f; y = %.3f; w = %.3f; h = %.3f; }",
+            rect.fLeft, rect.fTop, rect.width(), rect.height());
 }
 
-void writeIntPoint(FILE* file, int indentLevel, const char* str, IntPoint point)
+void LayerDumper::writeMatrix(const char* label, const TransformationMatrix& matrix)
 {
-    writeIndent(file, indentLevel);
-    fprintf(file, "%s = { x = %d; y = %d; };\n", str, point.x(), point.y());
+    WRITE_VAL("{ (%.2f,%.2f,%.2f,%.2f),(%.2f,%.2f,%.2f,%.2f),"
+            "(%.2f,%.2f,%.2f,%.2f),(%.2f,%.2f,%.2f,%.2f) }",
+            matrix.m11(), matrix.m12(), matrix.m13(), matrix.m14(),
+            matrix.m21(), matrix.m22(), matrix.m23(), matrix.m24(),
+            matrix.m31(), matrix.m32(), matrix.m33(), matrix.m34(),
+            matrix.m41(), matrix.m42(), matrix.m43(), matrix.m44());
 }
 
-void writeSize(FILE* file, int indentLevel, const char* str, SkSize size)
+void LayerDumper::writeLength(const char* label, SkLength value)
 {
-    writeIndent(file, indentLevel);
-    fprintf(file, "%s = { w = %.3f; h = %.3f; };\n", str, size.width(), size.height());
+    if (value.defined())
+        WRITE_VAL("{ type = %d; value = %.2f; }", value.type, value.value);
+    else
+        writeEntry(label, "<undefined>");
 }
 
-void writeRect(FILE* file, int indentLevel, const char* str, SkRect rect)
+void FileLayerDumper::beginLayer(const char* className, const LayerAndroid* layerPtr)
 {
-    writeIndent(file, indentLevel);
-    fprintf(file, "%s = { x = %.3f; y = %.3f; w = %.3f; h = %.3f; };\n",
-            str, rect.fLeft, rect.fTop, rect.width(), rect.height());
+    LayerDumper::beginLayer(className, layerPtr);
+    writeLine("{");
+    writeHexVal("layer", (int)layerPtr);
 }
 
-void writeMatrix(FILE* file, int indentLevel, const char* str, const TransformationMatrix& matrix)
+void FileLayerDumper::endLayer()
 {
-    writeIndent(file, indentLevel);
-    fprintf(file, "%s = { (%.2f,%.2f,%.2f,%.2f),(%.2f,%.2f,%.2f,%.2f),"
-            "(%.2f,%.2f,%.2f,%.2f),(%.2f,%.2f,%.2f,%.2f) };\n",
-            str,
-            matrix.m11(), matrix.m12(), matrix.m13(), matrix.m14(),
-            matrix.m21(), matrix.m22(), matrix.m23(), matrix.m24(),
-            matrix.m31(), matrix.m32(), matrix.m33(), matrix.m34(),
-            matrix.m41(), matrix.m42(), matrix.m43(), matrix.m44());
+    writeLine("}");
+    LayerDumper::endLayer();
+}
+
+void FileLayerDumper::writeEntry(const char* label, const char* value)
+{
+    fprintf(m_file, "%*s%s = %s\n", (m_indentLevel + 1) * 2, " ", label, value);
+}
+
+void FileLayerDumper::writeLine(const char* str)
+{
+    if (m_indentLevel)
+        fprintf(m_file, "%*s", m_indentLevel * 2, " ");
+    fprintf(m_file, "%s\n", str);
 }
 
 } // namespace WebCore