2 files changed, 92 insertions, 1 deletions

diff --git a/Source/WebKit/android/jni/ViewStateSerializer.cpp b/Source/WebKit/android/jni/ViewStateSerializer.cpp
index 02ddca6..8963837 100644
--- a/Source/WebKit/android/jni/ViewStateSerializer.cpp
+++ b/Source/WebKit/android/jni/ViewStateSerializer.cpp
@@ -30,6 +30,7 @@
 
 #include "BaseLayerAndroid.h"
 #include "CreateJavaOutputStreamAdaptor.h"
+#include "DumpLayer.h"
 #include "FixedPositioning.h"
 #include "ImagesManager.h"
 #include "IFrameContentLayerAndroid.h"
@@ -56,6 +57,68 @@ enum LayerTypes {
     LTFixedLayerAndroid = 3
 };
 
+#define ID "mID"
+#define LEFT "layout:mLeft"
+#define TOP "layout:mTop"
+#define WIDTH "layout:getWidth()"
+#define HEIGHT "layout:getHeight()"
+
+class HierarchyLayerDumper : public LayerDumper {
+public:
+    HierarchyLayerDumper(SkWStream* stream, int level)
+        : LayerDumper(level)
+        , m_stream(stream)
+    {}
+
+    virtual void beginLayer(const char* className, const LayerAndroid* layerPtr) {
+        LayerDumper::beginLayer(className, layerPtr);
+        for (int i = 0; i < m_indentLevel; i++) {
+            m_stream->writeText(" ");
+        }
+        m_stream->writeText(className);
+        m_stream->writeText("@");
+        m_stream->writeHexAsText(layerPtr->uniqueId());
+        m_stream->writeText(" ");
+
+        writeHexVal(ID, (int) layerPtr);
+        writeIntVal(LEFT, layerPtr->getPosition().fX);
+        writeIntVal(TOP, layerPtr->getPosition().fY);
+        writeIntVal(WIDTH, layerPtr->getWidth());
+        writeIntVal(HEIGHT, layerPtr->getHeight());
+    }
+
+    virtual void beginChildren(int childCount) {
+        m_stream->writeText("\n");
+        LayerDumper::beginChildren(childCount);
+    }
+
+protected:
+    virtual void writeEntry(const char* label, const char* value) {
+        m_stream->writeText(label);
+        m_stream->writeText("=");
+        int len = strlen(value);
+        m_stream->writeDecAsText(len);
+        m_stream->writeText(",");
+        m_stream->writeText(value);
+        m_stream->writeText(" ");
+    }
+
+private:
+    SkWStream* m_stream;
+};
+
+static void nativeDumpLayerHierarchy(JNIEnv* env, jobject, jint jbaseLayer, jint level,
+                                     jobject jstream, jbyteArray jstorage)
+{
+    SkWStream *stream = CreateJavaOutputStreamAdaptor(env, jstream, jstorage);
+    BaseLayerAndroid* baseLayer = reinterpret_cast<BaseLayerAndroid*>(jbaseLayer);
+    SkSafeRef(baseLayer);
+    HierarchyLayerDumper dumper(stream, level);
+    baseLayer->dumpLayers(&dumper);
+    SkSafeUnref(baseLayer);
+    delete stream;
+}
+
 static bool nativeSerializeViewState(JNIEnv* env, jobject, jint jbaseLayer,
                                      jobject jstream, jbyteArray jstorage)
 {
@@ -478,6 +541,8 @@ LayerAndroid* deserializeLayer(int version, SkStream* stream)
  * JNI registration
  */
 static JNINativeMethod gSerializerMethods[] = {
+    { "nativeDumpLayerHierarchy", "(IILjava/io/OutputStream;[B)V",
+        (void*) nativeDumpLayerHierarchy },
     { "nativeSerializeViewState", "(ILjava/io/OutputStream;[B)Z",
         (void*) nativeSerializeViewState },
     { "nativeDeserializeViewState", "(ILjava/io/InputStream;[B)I",
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index 8e88131..c708c25 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -32,6 +32,7 @@
 #include "BaseLayerAndroid.h"
 #include "BaseRenderer.h"
 #include "DrawExtra.h"
+#include "DumpLayer.h"
 #include "Frame.h"
 #include "GLWebViewState.h"
 #include "GraphicsJNI.h"
@@ -995,6 +996,28 @@ static void nativeCopyBaseContentToPicture(JNIEnv *env, jobject obj, jobject pic
     GET_NATIVE_VIEW(env, obj)->copyBaseContentToPicture(picture);
 }
 
+static jboolean nativeDumpLayerContentToPicture(JNIEnv *env, jobject obj, jint instance,
+                                                jstring jclassName, jint layerId, jobject pict)
+{
+    bool success = false;
+    SkPicture* picture = GraphicsJNI::getNativePicture(env, pict);
+    std::string classname = jstringToStdString(env, jclassName);
+    BaseLayerAndroid* baseLayer = reinterpret_cast<WebView*>(instance)->getBaseLayer();
+    LayerAndroid* layer = baseLayer->findById(layerId);
+    SkSafeRef(layer);
+    if (layer && layer->subclassName() == classname) {
+        LayerContent* content = layer->content();
+        if (content) {
+            SkCanvas* canvas = picture->beginRecording(content->width(), content->height());
+            content->draw(canvas);
+            picture->endRecording();
+            success = true;
+        }
+    }
+    SkSafeUnref(layer);
+    return success;
+}
+
 static bool nativeHasContent(JNIEnv *env, jobject obj)
 {
     return GET_NATIVE_VIEW(env, obj)->hasContent();
@@ -1187,7 +1210,8 @@ static void nativeDumpDisplayTree(JNIEnv* env, jobject jwebview, jstring jurl)
         if (baseLayer) {
           FILE* file = fopen(LAYERS_TREE_LOG_FILE,"w");
           if (file) {
-              baseLayer->dumpLayers(file, 0);
+              WebCore::FileLayerDumper dumper(file);
+              baseLayer->dumpLayers(&dumper);
               fclose(file);
           }
         }
@@ -1355,6 +1379,8 @@ static JNINativeMethod gJavaWebViewMethods[] = {
         (void*) nativeGetBaseLayer },
     { "nativeCopyBaseContentToPicture", "(Landroid/graphics/Picture;)V",
         (void*) nativeCopyBaseContentToPicture },
+    { "nativeDumpLayerContentToPicture", "(ILjava/lang/String;ILandroid/graphics/Picture;)Z",
+        (void*) nativeDumpLayerContentToPicture },
     { "nativeHasContent", "()Z",
         (void*) nativeHasContent },
     { "nativeDiscardAllTextures", "()V",