diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-22 15:37:06 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-07-27 10:20:25 +0100 |
| commit | 967717af5423377c967781471ee106e2bb4e11c8 (patch) | |
| tree | 1e701dc0a12f7f07cce1df4a7681717de77a211b /WebCore/plugins/win/PluginViewWin.cpp | |
| parent | dcc30a9fca45f634b1d3a12b276d3a0ccce99fc3 (diff) | |
| download | external_webkit-967717af5423377c967781471ee106e2bb4e11c8.zip external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.gz external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.bz2 | |
Merge WebKit at r63859 : Initial merge by git.
Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
Diffstat (limited to 'WebCore/plugins/win/PluginViewWin.cpp')
| -rw-r--r-- | WebCore/plugins/win/PluginViewWin.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/WebCore/plugins/win/PluginViewWin.cpp b/WebCore/plugins/win/PluginViewWin.cpp index 1765939..8dbb04b 100644 --- a/WebCore/plugins/win/PluginViewWin.cpp +++ b/WebCore/plugins/win/PluginViewWin.cpp @@ -30,6 +30,8 @@ #include "BitmapImage.h" #include "Bridge.h" +#include "Chrome.h" +#include "ChromeClient.h" #include "Document.h" #include "DocumentLoader.h" #include "Element.h" @@ -656,7 +658,6 @@ void PluginView::handleKeyboardEvent(KeyboardEvent* event) } #if !OS(WINCE) -extern HCURSOR lastSetCursor; extern bool ignoreNextSetCursor; #endif @@ -727,7 +728,8 @@ void PluginView::handleMouseEvent(MouseEvent* event) // 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; - lastSetCursor = ::GetCursor(); + if (Page* page = m_parentFrame->page()) + page->chrome()->client()->setLastSetCursorToCurrentCursor(); #endif } |