hack to set focus for plugins

expose pluginview from pluginwidget

2 files changed, 17 insertions, 1 deletions

diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index 89013ff..c1df546 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -1273,6 +1273,15 @@ void WebViewCore::setKitFocus(int moveGeneration, int buildGeneration,
     finalKitFocus(frame, node, x, y);
 }
 
+static bool nodeIsPlugin(Node* node) {
+    RenderObject* renderer = node->renderer();
+    if (renderer->isWidget()) {
+        Widget* widget = static_cast<RenderWidget*>(renderer)->widget();
+        return widget && widget->isPluginView();
+    }
+    return NULL;
+}
+
 // Update mouse position and may change focused node.
 bool WebViewCore::finalKitFocus(WebCore::Frame* frame, WebCore::Node* node,
     int x, int y)
@@ -1300,6 +1309,11 @@ bool WebViewCore::finalKitFocus(WebCore::Frame* frame, WebCore::Node* node,
     builder.setLastFocus(node);
     m_lastFocused = node;
     m_lastFocusedBounds = node->getRect();
+
+    // hack to give the plugin focus (for keys). better fix on the way
+    if (nodeIsPlugin(node)) {
+        node->document()->setFocusedNode(node);
+    }
     return true;
 }
 
diff --git a/WebKit/android/plugins/PluginWidgetAndroid.h b/WebKit/android/plugins/PluginWidgetAndroid.h
index e8f5e6a..157651c 100644
--- a/WebKit/android/plugins/PluginWidgetAndroid.h
+++ b/WebKit/android/plugins/PluginWidgetAndroid.h
@@ -49,7 +49,9 @@ struct PluginWidgetAndroid {
     // destroyed.
     PluginWidgetAndroid(WebCore::PluginView* view);
     ~PluginWidgetAndroid();
-    
+
+    WebCore::PluginView* pluginView() const { return m_pluginView; }
+
     /*  Can't determine our core at construction time, so PluginView calls this
         as soon as it has a parent.
      */