3 files changed, 10 insertions, 4 deletions
diff --git a/webkit/glue/plugins/pepper_cursor_control.cc b/webkit/glue/plugins/pepper_cursor_control.cc
index 997efef..de3c166 100644
--- a/webkit/glue/plugins/pepper_cursor_control.cc
+++ b/webkit/glue/plugins/pepper_cursor_control.cc
@@ -37,7 +37,7 @@ bool SetCursor(PP_Instance instance_id,
   return instance->SetCursor(type);
 }
 
-bool LockCursor(PP_Instance) {
+bool LockCursor(PP_Instance instance_id) {
   PluginInstance* instance = PluginInstance::FromPPInstance(instance_id);
   if (!instance)
     return false;
@@ -46,7 +46,7 @@ bool LockCursor(PP_Instance) {
   return false;
 }
 
-bool UnlockCursor(PP_Instance) {
+bool UnlockCursor(PP_Instance instance_id) {
   PluginInstance* instance = PluginInstance::FromPPInstance(instance_id);
   if (!instance)
     return false;
@@ -55,7 +55,7 @@ bool UnlockCursor(PP_Instance) {
   return false;
 }
 
-bool HasCursorLock(PP_Instance) {
+bool HasCursorLock(PP_Instance instance_id) {
   PluginInstance* instance = PluginInstance::FromPPInstance(instance_id);
   if (!instance)
     return false;
@@ -64,7 +64,7 @@ bool HasCursorLock(PP_Instance) {
   return false;
 }
 
-bool CanLockCursor(PP_Instance) {
+bool CanLockCursor(PP_Instance instance_id) {
   PluginInstance* instance = PluginInstance::FromPPInstance(instance_id);
   if (!instance)
     return false;
diff --git a/webkit/glue/plugins/pepper_plugin_module.cc b/webkit/glue/plugins/pepper_plugin_module.cc
index a0785cc..8068a72 100644
--- a/webkit/glue/plugins/pepper_plugin_module.cc
+++ b/webkit/glue/plugins/pepper_plugin_module.cc
@@ -14,6 +14,7 @@
 #include "base/time.h"
 #include "third_party/ppapi/c/dev/ppb_buffer_dev.h"
 #include "third_party/ppapi/c/dev/ppb_char_set_dev.h"
+#include "third_party/ppapi/c/dev/ppb_cursor_control_dev.h"
 #include "third_party/ppapi/c/dev/ppb_directory_reader_dev.h"
 #include "third_party/ppapi/c/dev/ppb_file_io_dev.h"
 #include "third_party/ppapi/c/dev/ppb_file_io_trusted_dev.h"
@@ -43,6 +44,7 @@
 #include "webkit/glue/plugins/pepper_audio.h"
 #include "webkit/glue/plugins/pepper_buffer.h"
 #include "webkit/glue/plugins/pepper_char_set.h"
+#include "webkit/glue/plugins/pepper_cursor_control.h"
 #include "webkit/glue/plugins/pepper_directory_reader.h"
 #include "webkit/glue/plugins/pepper_file_chooser.h"
 #include "webkit/glue/plugins/pepper_file_io.h"
@@ -226,6 +228,8 @@ const void* GetInterface(const char* name) {
     return VideoDecoder::GetInterface();
   if (strcmp(name, PPB_CHAR_SET_DEV_INTERFACE) == 0)
     return CharSet::GetInterface();
+  if (strcmp(name, PPB_CURSOR_CONTROL_DEV_INTERFACE) == 0)
+    return GetCursorControlInterface();
 
   // Only support the testing interface when the command line switch is
   // specified. This allows us to prevent people from (ab)using this interface
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 2f5f96b..3233afe 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -193,6 +193,8 @@
         'plugins/pepper_buffer.h',
         'plugins/pepper_char_set.cc',
         'plugins/pepper_char_set.h',
+        'plugins/pepper_cursor_control.cc',
+        'plugins/pepper_cursor_control.h',
         'plugins/pepper_directory_reader.cc',
         'plugins/pepper_directory_reader.h',
         'plugins/pepper_event_conversion.cc',