diff options
| author | Derek Sollenberger <djsollen@google.com> | 2010-03-02 07:17:21 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-02 07:17:21 -0800 |
| commit | 51c22fe1544c725107ba905abf61b0735cc16652 (patch) | |
| tree | 9c15bd5641cae8de92d070b830543821e73ac9e5 /WebCore | |
| parent | 60aebe4c6428cce670cda380ae44c26711e9d56b (diff) | |
| parent | 4e409302db5afdfb18231bd3e1a86f85302a2599 (diff) | |
| download | external_webkit-51c22fe1544c725107ba905abf61b0735cc16652.zip external_webkit-51c22fe1544c725107ba905abf61b0735cc16652.tar.gz external_webkit-51c22fe1544c725107ba905abf61b0735cc16652.tar.bz2 | |
am 4e409302: am a506357e: Adding logging to android\'s plugin view.
Merge commit '4e409302db5afdfb18231bd3e1a86f85302a2599'
* commit '4e409302db5afdfb18231bd3e1a86f85302a2599':
Adding logging to android's plugin view.
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/plugins/android/PluginViewAndroid.cpp | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/WebCore/plugins/android/PluginViewAndroid.cpp b/WebCore/plugins/android/PluginViewAndroid.cpp index 0abbc13..ff72847 100644 --- a/WebCore/plugins/android/PluginViewAndroid.cpp +++ b/WebCore/plugins/android/PluginViewAndroid.cpp @@ -71,6 +71,12 @@ // #include "runtime.h" #include "WebViewCore.h" +/* Controls the printing of log messages in this file. This must be defined + before PluginDebugAndroid.h is included. + */ +#define PLUGIN_DEBUG_LOCAL 0 +#define TRACE_KEY_EVENTS 0 + #include "PluginDebug.h" #include "PluginDebugAndroid.h" #include "PluginViewBridgeAndroid.h" @@ -313,8 +319,8 @@ void PluginView::handleKeyboardEvent(KeyboardEvent* event) switch (pke->type()) { case PlatformKeyboardEvent::KeyDown: -#ifdef TRACE_KEY_EVENTS - SkDebugf("--------- KeyDown, ignore\n"); +#if TRACE_KEY_EVENTS + PLUGIN_LOG("--------- KeyDown, ignore\n"); #endif ignoreEvent = true; break; @@ -322,8 +328,8 @@ void PluginView::handleKeyboardEvent(KeyboardEvent* event) evt.data.key.action = kDown_ANPKeyAction; break; case PlatformKeyboardEvent::Char: -#ifdef TRACE_KEY_EVENTS - SkDebugf("--------- Char, ignore\n"); +#if TRACE_KEY_EVENTS + PLUGIN_LOG("--------- Char, ignore\n"); #endif ignoreEvent = true; break; @@ -331,8 +337,8 @@ void PluginView::handleKeyboardEvent(KeyboardEvent* event) evt.data.key.action = kUp_ANPKeyAction; break; default: -#ifdef TRACE_KEY_EVENTS - SkDebugf("------ unexpected keyevent type %d\n", pke->type()); +#if TRACE_KEY_EVENTS + PLUGIN_LOG("------ unexpected keyevent type %d\n", pke->type()); #endif ignoreEvent = true; break; @@ -388,6 +394,8 @@ NPError PluginView::getValueStatic(NPNVariable variable, void* value) void PluginView::setParent(ScrollView* parent) { + PLUGIN_LOG("--%p SetParent old=[%p], new=[%p] \n", instance(), this->parent(), parent); + Widget::setParent(parent); if (parent) { @@ -408,6 +416,8 @@ void PluginView::setNPWindowRect(const IntRect&) void PluginView::setNPWindowIfNeeded() { + PLUGIN_LOG("--%p SetWindow isStarted=[%d] \n", instance(), m_isStarted); + if (!m_isStarted || !parent()) return; @@ -616,6 +626,7 @@ void PluginView::paint(GraphicsContext* context, const IntRect& rect) void PluginView::updatePluginWidget() { FrameView* frameView = static_cast<FrameView*>(parent()); + PLUGIN_LOG("--%p UpdatePluginWidget frame=[%p] \n", instance(), frameView); if (frameView) { IntRect oldWindowRect = m_windowRect; |