diff options
| author | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 21:49:30 +0000 |
|---|---|---|
| committer | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 21:49:30 +0000 |
| commit | 7c51b0ee951bf8ed70d0ed6506567991c611d070 (patch) | |
| tree | 0d559aad012f55a540a990143bd1d9264e240319 /webkit/glue/chrome_client_impl.cc | |
| parent | 03ce3cd72a2bb330c774f47cea4ad346d5c26cad (diff) | |
| download | chromium_src-7c51b0ee951bf8ed70d0ed6506567991c611d070.zip chromium_src-7c51b0ee951bf8ed70d0ed6506567991c611d070.tar.gz chromium_src-7c51b0ee951bf8ed70d0ed6506567991c611d070.tar.bz2 | |
Start using WebCursorInfo from the WebKit API. WebCursorInfo is a
lightweight struct containing a description of a cursor that the
embedder should render.
WebCursor still exists. Instead of WebCursor initializing from a
PlatformCursor, it now initializes from a WebCursorInfo.
TEST=none
BUG=10039
R=jam
Review URL: http://codereview.chromium.org/155172
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20194 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/chrome_client_impl.cc')
| -rw-r--r-- | webkit/glue/chrome_client_impl.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/webkit/glue/chrome_client_impl.cc b/webkit/glue/chrome_client_impl.cc index 6341f55..d843b0f 100644 --- a/webkit/glue/chrome_client_impl.cc +++ b/webkit/glue/chrome_client_impl.cc @@ -36,6 +36,7 @@ MSVC_POP_WARNING(); #include "base/gfx/rect.h" #include "base/logging.h" #include "googleurl/src/gurl.h" +#include "webkit/api/public/WebCursorInfo.h" #include "webkit/api/public/WebInputEvent.h" #include "webkit/api/public/WebKit.h" #include "webkit/api/public/WebRect.h" @@ -48,6 +49,7 @@ MSVC_POP_WARNING(); #include "webkit/glue/webview_impl.h" #include "webkit/glue/webwidget_impl.h" +using WebKit::WebCursorInfo; using WebKit::WebInputEvent; using WebKit::WebMouseEvent; using WebKit::WebRect; @@ -603,7 +605,7 @@ void ChromeClientImpl::popupOpenedInternal( popup_items); } -void ChromeClientImpl::SetCursor(const WebCursor& cursor) { +void ChromeClientImpl::SetCursor(const WebCursorInfo& cursor) { if (ignore_next_set_cursor_) { ignore_next_set_cursor_ = false; return; @@ -614,7 +616,7 @@ void ChromeClientImpl::SetCursor(const WebCursor& cursor) { delegate->SetCursor(webview_, cursor); } -void ChromeClientImpl::SetCursorForPlugin(const WebCursor& cursor) { +void ChromeClientImpl::SetCursorForPlugin(const WebCursorInfo& cursor) { SetCursor(cursor); // Currently, Widget::setCursor is always called after this function in // EventHandler.cpp and since we don't want that we set a flag indicating |