diff options
Diffstat (limited to 'webkit/tools')
4 files changed, 13 insertions, 7 deletions
diff --git a/webkit/tools/test_shell/mac/test_webview_delegate.mm b/webkit/tools/test_shell/mac/test_webview_delegate.mm index 414ac6d..93a3032 100644 --- a/webkit/tools/test_shell/mac/test_webview_delegate.mm +++ b/webkit/tools/test_shell/mac/test_webview_delegate.mm @@ -7,6 +7,7 @@ #import <Cocoa/Cocoa.h> #include "base/string_util.h" #include "base/sys_string_conversions.h" +#include "webkit/api/public/WebCursorInfo.h" #include "webkit/api/public/WebRect.h" #include "webkit/glue/webcursor.h" #include "webkit/glue/webview.h" @@ -15,6 +16,7 @@ #include "webkit/glue/webmenurunner_mac.h" #include "webkit/tools/test_shell/test_shell.h" +using WebKit::WebCursorInfo; using WebKit::WebRect; // WebViewDelegate ----------------------------------------------------------- @@ -123,8 +125,8 @@ void TestWebViewDelegate::CloseWidgetSoon(WebWidget* webwidget) { } void TestWebViewDelegate::SetCursor(WebWidget* webwidget, - const WebCursor& cursor) { - NSCursor* ns_cursor = cursor.GetCursor(); + const WebCursorInfo& cursor_info) { + NSCursor* ns_cursor = WebCursor(cursor_info).GetCursor(); [ns_cursor set]; } diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h index 221943e..4c0f079 100644 --- a/webkit/tools/test_shell/test_webview_delegate.h +++ b/webkit/tools/test_shell/test_webview_delegate.h @@ -237,7 +237,7 @@ class TestWebViewDelegate : public base::RefCounted<TestWebViewDelegate>, virtual void Focus(WebWidget* webwidget); virtual void Blur(WebWidget* webwidget); virtual void SetCursor(WebWidget* webwidget, - const WebCursor& cursor); + const WebKit::WebCursorInfo& cursor); virtual void GetWindowRect(WebWidget* webwidget, WebKit::WebRect* rect); virtual void SetWindowRect(WebWidget* webwidget, const WebKit::WebRect& rect); diff --git a/webkit/tools/test_shell/test_webview_delegate_gtk.cc b/webkit/tools/test_shell/test_webview_delegate_gtk.cc index a05eefd..46ecc9d 100644 --- a/webkit/tools/test_shell/test_webview_delegate_gtk.cc +++ b/webkit/tools/test_shell/test_webview_delegate_gtk.cc @@ -15,6 +15,7 @@ #include "base/string_util.h" #include "net/base/net_errors.h" #include "chrome/common/page_transition_types.h" +#include "webkit/api/public/WebCursorInfo.h" #include "webkit/api/public/WebRect.h" #include "webkit/glue/webcursor.h" #include "webkit/glue/webdropdata.h" @@ -30,6 +31,7 @@ #include "webkit/tools/test_shell/test_navigation_controller.h" #include "webkit/tools/test_shell/test_shell.h" +using WebKit::WebCursorInfo; using WebKit::WebRect; namespace { @@ -145,8 +147,8 @@ void TestWebViewDelegate::CloseWidgetSoon(WebWidget* webwidget) { } void TestWebViewDelegate::SetCursor(WebWidget* webwidget, - const WebCursor& cursor) { - current_cursor_ = cursor; + const WebCursorInfo& cursor_info) { + current_cursor_.InitFromCursorInfo(cursor_info); GdkCursorType cursor_type = current_cursor_.GetCursorType(); GdkCursor* gdk_cursor; if (cursor_type == GDK_CURSOR_IS_PIXMAP) { diff --git a/webkit/tools/test_shell/test_webview_delegate_win.cc b/webkit/tools/test_shell/test_webview_delegate_win.cc index a0f3254..c0dbc825 100644 --- a/webkit/tools/test_shell/test_webview_delegate_win.cc +++ b/webkit/tools/test_shell/test_webview_delegate_win.cc @@ -19,6 +19,7 @@ #include "base/string_util.h" #include "base/trace_event.h" #include "net/base/net_errors.h" +#include "webkit/api/public/WebCursorInfo.h" #include "webkit/api/public/WebRect.h" #include "webkit/glue/webdropdata.h" #include "webkit/glue/webframe.h" @@ -34,6 +35,7 @@ #include "webkit/tools/test_shell/test_navigation_controller.h" #include "webkit/tools/test_shell/test_shell.h" +using WebKit::WebCursorInfo; using WebKit::WebRect; // WebViewDelegate ----------------------------------------------------------- @@ -97,9 +99,9 @@ void TestWebViewDelegate::CloseWidgetSoon(WebWidget* webwidget) { } void TestWebViewDelegate::SetCursor(WebWidget* webwidget, - const WebCursor& cursor) { + const WebCursorInfo& cursor_info) { if (WebWidgetHost* host = GetHostForWidget(webwidget)) { - current_cursor_ = cursor; + current_cursor_.InitFromCursorInfo(cursor_info); HINSTANCE mod_handle = GetModuleHandle(NULL); host->SetCursor(current_cursor_.GetCursor(mod_handle)); } |