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/platform/win/WidgetWin.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/platform/win/WidgetWin.cpp')
| -rw-r--r-- | WebCore/platform/win/WidgetWin.cpp | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/WebCore/platform/win/WidgetWin.cpp b/WebCore/platform/win/WidgetWin.cpp index 607c0d8..416260b 100644 --- a/WebCore/platform/win/WidgetWin.cpp +++ b/WebCore/platform/win/WidgetWin.cpp @@ -59,7 +59,6 @@ void Widget::hide() { } -HCURSOR lastSetCursor = 0; bool ignoreNextSetCursor = false; void Widget::setCursor(const Cursor& cursor) @@ -71,30 +70,10 @@ void Widget::setCursor(const Cursor& cursor) return; } - if (!cursor.impl()->nativeCursor()) - return; - - lastSetCursor = cursor.impl()->nativeCursor(); - ScrollView* view = root(); - if (!view || !view->isFrameView()) { - SetCursor(lastSetCursor); - return; - } - - Frame* frame = static_cast<FrameView*>(view)->frame(); - if (!frame) { - SetCursor(lastSetCursor); + if (!view) return; - } - - Page* page = frame->page(); - if (!page) { - SetCursor(lastSetCursor); - return; - } - - page->chrome()->setCursor(lastSetCursor); + view->hostWindow()->setCursor(cursor); } void Widget::paint(GraphicsContext*, const IntRect&) |