summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/Source/WebCore/plugins/PluginView.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/webkit/Source/WebCore/plugins/PluginView.cpp')
-rw-r--r--src/3rdparty/webkit/Source/WebCore/plugins/PluginView.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/Source/WebCore/plugins/PluginView.cpp b/src/3rdparty/webkit/Source/WebCore/plugins/PluginView.cpp
index fd2b0b0..b020946 100644
--- a/src/3rdparty/webkit/Source/WebCore/plugins/PluginView.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/plugins/PluginView.cpp
@@ -909,8 +909,9 @@ void PluginView::focusPluginElement()
{
// Focus the plugin
if (Page* page = m_parentFrame->page())
- page->focusController()->setFocusedFrame(m_parentFrame);
- m_parentFrame->document()->setFocusedNode(m_element);
+ page->focusController()->setFocusedNode(m_element, m_parentFrame);
+ else
+ m_parentFrame->document()->setFocusedNode(m_element);
}
void PluginView::didReceiveResponse(const ResourceResponse& response)