2 files changed, 44 insertions, 1 deletions
diff --git a/Source/WebKit/android/AndroidLog.h b/Source/WebKit/android/AndroidLog.h
index 4090ab9..3ac210f 100644
--- a/Source/WebKit/android/AndroidLog.h
+++ b/Source/WebKit/android/AndroidLog.h
@@ -26,8 +26,14 @@
 #ifndef AndroidLog_h
 #define AndroidLog_h
 
+#ifndef LOG_TAG
+#define LOG_TAG __FILE__
+#endif
+
+#include <cutils/log.h>
+#include <wtf/CurrentTime.h>
+
 #ifdef ANDROID_DOM_LOGGING
-#include <utils/Log.h>
 #include <stdio.h>
 extern FILE* gDomTreeFile;
 #define DOM_TREE_LOG_FILE "/sdcard/domTree.txt"
@@ -46,4 +52,21 @@ extern FILE* gRenderTreeFile;
 #define DISPLAY_TREE_LOG_FILE "/sdcard/displayTree.txt"
 #define LAYERS_TREE_LOG_FILE "/sdcard/layersTree.plist"
 
+#define TIME_METHOD() MethodTimer __method_timer(__func__)
+class MethodTimer {
+public:
+    MethodTimer(const char* name)
+        : m_methodName(name)
+    {
+        m_startTime = currentTimeMS();
+    }
+    virtual ~MethodTimer() {
+        double duration = currentTimeMS() - m_startTime;
+        ALOGD("%s took %.2fms", m_methodName, duration);
+    }
+private:
+    const char* m_methodName;
+    double m_startTime;
+};
+
 #endif // AndroidLog_h
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index eddf0ab..0b2eaf6 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -633,6 +633,17 @@ void mapLayerRect(int layerId, SkIRect& rect) {
     }
 }
 
+// This is called when WebView switches rendering modes in a more permanent fashion
+// such as when the layer type is set or the view is attached/detached from the window
+int setHwAccelerated(bool hwAccelerated) {
+    if (!m_glWebViewState)
+        return 0;
+    LayerAndroid* root = compositeRoot();
+    if (root)
+        return root->setHwAccelerated(hwAccelerated);
+    return 0;
+}
+
     bool m_isDrawingPaused;
 private: // local state for WebView
     // private to getFrameCache(); other functions operate in a different thread
@@ -1176,6 +1187,13 @@ static void nativeMapLayerRect(JNIEnv *env, jobject obj, jint nativeView,
     GraphicsJNI::irect_to_jrect(nativeRect, env, rect);
 }
 
+static jint nativeSetHwAccelerated(JNIEnv *env, jobject obj, jint nativeView,
+        jboolean hwAccelerated)
+{
+    WebView* webview = reinterpret_cast<WebView*>(nativeView);
+    return webview->setHwAccelerated(hwAccelerated);
+}
+
 /*
  * JNI registration
  */
@@ -1254,6 +1272,8 @@ static JNINativeMethod gJavaWebViewMethods[] = {
         (void*) nativeIsBaseFirst },
     { "nativeMapLayerRect", "(IILandroid/graphics/Rect;)V",
         (void*) nativeMapLayerRect },
+    { "nativeSetHwAccelerated", "(IZ)I",
+        (void*) nativeSetHwAccelerated },
 };
 
 int registerWebView(JNIEnv* env)