Index: webkit/plugins/ppapi/ppb_cursor_control_impl.cc |
=================================================================== |
--- webkit/plugins/ppapi/ppb_cursor_control_impl.cc (revision 0) |
+++ webkit/plugins/ppapi/ppb_cursor_control_impl.cc (working copy) |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "webkit/glue/plugins/pepper_cursor_control.h" |
+#include "webkit/plugins/ppapi/ppb_cursor_control_impl.h" |
#include "base/logging.h" |
#include "base/ref_counted.h" |
@@ -10,25 +10,26 @@ |
#include "ppapi/c/dev/ppb_cursor_control_dev.h" |
#include "ppapi/c/pp_point.h" |
#include "ppapi/c/pp_resource.h" |
-#include "webkit/glue/plugins/pepper_common.h" |
-#include "webkit/glue/plugins/pepper_image_data.h" |
-#include "webkit/glue/plugins/pepper_plugin_instance.h" |
-#include "webkit/glue/plugins/pepper_resource.h" |
+#include "webkit/plugins/ppapi/common.h" |
+#include "webkit/plugins/ppapi/ppb_image_data_impl.h" |
+#include "webkit/plugins/ppapi/plugin_instance.h" |
+#include "webkit/plugins/ppapi/resource.h" |
-namespace pepper { |
+namespace webkit { |
+namespace ppapi { |
namespace { |
PP_Bool SetCursor(PP_Instance instance_id, |
- PP_CursorType_Dev type, |
- PP_Resource custom_image_id, |
- const PP_Point* hot_spot) { |
+ PP_CursorType_Dev type, |
+ PP_Resource custom_image_id, |
+ const PP_Point* hot_spot) { |
PluginInstance* instance = ResourceTracker::Get()->GetInstance(instance_id); |
if (!instance) |
return PP_FALSE; |
- scoped_refptr<ImageData> custom_image( |
- Resource::GetAs<ImageData>(custom_image_id)); |
+ scoped_refptr<PPB_ImageData_Impl> custom_image( |
+ Resource::GetAs<PPB_ImageData_Impl>(custom_image_id)); |
if (custom_image.get()) { |
// TODO(neb): implement custom cursors. |
NOTIMPLEMENTED(); |
@@ -88,5 +89,6 @@ |
return &cursor_control_interface; |
} |
-} // namespace pepper |
+} // namespace ppapi |
+} // namespace webkit |