From a614d906eb7d2f52fea2d99757578c294fc898b4 Mon Sep 17 00:00:00 2001 From: Derek Sollenberger Date: Fri, 7 Jan 2011 11:04:46 -0500 Subject: [PATCH] Add additional debugging for plugins. Change-Id: Ie4437e0b62a16ee7e9d1b6fc605554ecc161cc6c --- WebKit/android/plugins/PluginDebugAndroid.cpp | 4 ++++ WebKit/android/plugins/PluginDebugAndroid.h | 2 +- WebKit/android/plugins/PluginWidgetAndroid.cpp | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/WebKit/android/plugins/PluginDebugAndroid.cpp b/WebKit/android/plugins/PluginDebugAndroid.cpp index 0388d4be4..3958714af 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 92092d566..500288278 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 de3d94438..b995f1736 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; -- 2.11.0