Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(559)

Unified Diff: webkit/plugins/ppapi/ppb_cursor_control_impl.cc

Issue 6720001: PPB_CursorControl_Dev.SetCursor: Add support for custom cursor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/plugins/ppapi/ppapi_plugin_instance.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/ppapi/ppb_cursor_control_impl.cc
diff --git a/webkit/plugins/ppapi/ppb_cursor_control_impl.cc b/webkit/plugins/ppapi/ppb_cursor_control_impl.cc
index 83c004d76a974c1d91261a33c2a173cd9618556c..fd0eb8bba199255bf8f51149abb97d3644a73186 100644
--- a/webkit/plugins/ppapi/ppb_cursor_control_impl.cc
+++ b/webkit/plugins/ppapi/ppb_cursor_control_impl.cc
@@ -28,16 +28,7 @@ PP_Bool SetCursor(PP_Instance instance_id,
if (!instance)
return PP_FALSE;
- scoped_refptr<PPB_ImageData_Impl> custom_image(
- Resource::GetAs<PPB_ImageData_Impl>(custom_image_id));
- if (custom_image.get()) {
- // TODO(neb): implement custom cursors.
- // (Remember that PP_CURSORTYPE_CUSTOM != WebCursorInfo::TypeCustom.)
- NOTIMPLEMENTED();
- return PP_FALSE;
- }
-
- return BoolToPPBool(instance->SetCursor(type));
+ return BoolToPPBool(instance->SetCursor(type, custom_image_id, hot_spot));
}
PP_Bool LockCursor(PP_Instance instance_id) {
@@ -92,4 +83,3 @@ const PPB_CursorControl_Dev* GetCursorControlInterface() {
} // namespace ppapi
} // namespace webkit
-
« no previous file with comments | « webkit/plugins/ppapi/ppapi_plugin_instance.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698