diff options
author | Feng Qian <fqian@google.com> | 2009-06-17 12:12:20 -0700 |
---|---|---|
committer | Feng Qian <fqian@google.com> | 2009-06-17 12:12:20 -0700 |
commit | 5f1ab04193ad0130ca8204aadaceae083aca9881 (patch) | |
tree | 5a92cd389e2cfe7fb67197ce14b38469462379f8 /WebCore/plugins/win/PluginViewWin.cpp | |
parent | 194315e5a908cc8ed67d597010544803eef1ac59 (diff) | |
download | external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.zip external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.gz external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.bz2 |
Get WebKit r44544.
Diffstat (limited to 'WebCore/plugins/win/PluginViewWin.cpp')
-rw-r--r-- | WebCore/plugins/win/PluginViewWin.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/WebCore/plugins/win/PluginViewWin.cpp b/WebCore/plugins/win/PluginViewWin.cpp index 895338e..7e80aa4 100644 --- a/WebCore/plugins/win/PluginViewWin.cpp +++ b/WebCore/plugins/win/PluginViewWin.cpp @@ -45,7 +45,6 @@ #include "KeyboardEvent.h" #include "MIMETypeRegistry.h" #include "MouseEvent.h" -#include "NotImplemented.h" #include "Page.h" #include "FocusController.h" #include "PlatformMouseEvent.h" @@ -552,10 +551,7 @@ void PluginView::handleMouseEvent(MouseEvent* event) } } else if (event->type() == eventNames().mousedownEvent) { - // Focus the plugin - if (Page* page = m_parentFrame->page()) - page->focusController()->setFocusedFrame(m_parentFrame); - m_parentFrame->document()->setFocusedNode(m_element); + focusPluginElement(); switch (event->button()) { case 0: npEvent.event = WM_LBUTTONDOWN; @@ -582,8 +578,6 @@ void PluginView::handleMouseEvent(MouseEvent* event) } else return; - HCURSOR currentCursor = ::GetCursor(); - JSC::JSLock::DropAllLocks dropAllLocks(false); if (!dispatchNPEvent(npEvent)) event->setDefaultHandled(); @@ -591,7 +585,7 @@ void PluginView::handleMouseEvent(MouseEvent* event) #if !PLATFORM(QT) // Currently, Widget::setCursor is always called after this function in EventHandler.cpp // and since we don't want that we set ignoreNextSetCursor to true here to prevent that. - ignoreNextSetCursor = true; + ignoreNextSetCursor = true; lastSetCursor = ::GetCursor(); #endif } |