Merge "Add additional debugging for plugins." into honeycomb

3 files changed, 7 insertions, 1 deletions

diff --git a/WebKit/android/plugins/PluginDebugAndroid.cpp b/WebKit/android/plugins/PluginDebugAndroid.cpp
index 0388d4b..3958714 100644
--- a/WebKit/android/plugins/PluginDebugAndroid.cpp
+++ b/WebKit/android/plugins/PluginDebugAndroid.cpp
@@ -108,6 +108,10 @@ void anp_logPluginEvent(void* npp, const ANPEvent* evt, int16_t returnVal, int e
                         npp, elapsedTime, evt->data.draw.data.bitmap.format,
                         evt->data.draw.clip.left, evt->data.draw.clip.top,
                         evt->data.draw.clip.right, evt->data.draw.clip.bottom);
+            } else if (evt->data.draw.model == kOpenGL_ANPDrawingModel) {
+                anp_logPlugin("%p EVENT::DRAW openGL time=%d dimensions=[%d,%d]",
+                        npp, elapsedTime, evt->data.draw.data.surface.width,
+                        evt->data.draw.data.surface.height);
             } else {
                 anp_logPlugin("%p EVENT::DRAW unknown drawing model", npp);
             }
diff --git a/WebKit/android/plugins/PluginDebugAndroid.h b/WebKit/android/plugins/PluginDebugAndroid.h
index 92092d5..5002882 100644
--- a/WebKit/android/plugins/PluginDebugAndroid.h
+++ b/WebKit/android/plugins/PluginDebugAndroid.h
@@ -47,7 +47,7 @@ void anp_logPlugin(const char format[], ...);
    each event are logged, as well as the value returned by the plugin instance
    and how long the instance took to process the event (in milliseconds).
  */
-void anp_logPluginEvent(void* npp, const ANPEvent* event, int16 returnVal, int elapsedTime);
+void anp_logPluginEvent(void* npp, const ANPEvent* event, int16_t returnVal, int elapsedTime);
 
 #else
 # define PLUGIN_LOG(A, B...)    do { } while(0)
diff --git a/WebKit/android/plugins/PluginWidgetAndroid.cpp b/WebKit/android/plugins/PluginWidgetAndroid.cpp
index de3d944..b995f17 100644
--- a/WebKit/android/plugins/PluginWidgetAndroid.cpp
+++ b/WebKit/android/plugins/PluginWidgetAndroid.cpp
@@ -365,6 +365,8 @@ void PluginWidgetAndroid::setVisibleScreen(const ANPRectI& visibleDocRect, float
     // notify the plugin of the new size
     // TODO what if the plugin changes sizes?
     if (m_drawingModel == kOpenGL_ANPDrawingModel && m_zoomLevel != zoom) {
+        PLUGIN_LOG("%s (%d,%d)[%f]", __FUNCTION__, m_pluginWindow->width,
+                m_pluginWindow->height, zoom);
         ANPEvent event;
         SkANP::InitEvent(&event, kDraw_ANPEventType);
         event.data.draw.model = kOpenGL_ANPDrawingModel;