Revert 65856 - Add implementations for Fullscreen and CursorControl i…

…nterfaces.

TEST=none
BUG=none
Review URL: http://codereview.chromium.org/4809002

TBR=brettw@chromium.org
Review URL: http://codereview.chromium.org/4822001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65857 0039d316-1c4b-4281-b951-d872f2087c98

ppapi/ppapi.gyp

@@ -522,12 +522,8 @@
         'proxy/ppb_char_set_proxy.h',
         'proxy/ppb_core_proxy.cc',
         'proxy/ppb_core_proxy.h',
-        'proxy/ppb_cursor_control_proxy.cc',
-        'proxy/ppb_cursor_control_proxy.h',
         'proxy/ppb_font_proxy.cc',
         'proxy/ppb_font_proxy.h',
-        'proxy/ppb_fullscreen_proxy.cc',
-        'proxy/ppb_fullscreen_proxy.h',
         'proxy/ppb_graphics_2d_proxy.cc',
         'proxy/ppb_graphics_2d_proxy.h',
         'proxy/ppb_image_data_proxy.cc',

ppapi/proxy/dispatcher.cc

@@ -14,8 +14,6 @@
 #include "ipc/ipc_sync_channel.h"
 #include "ppapi/c/dev/ppb_char_set_dev.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
-#include "ppapi/c/dev/ppb_cursor_control_dev.h"
-#include "ppapi/c/dev/ppb_fullscreen_dev.h"
 #include "ppapi/c/dev/ppb_testing_dev.h"
 #include "ppapi/c/dev/ppb_var_deprecated.h"
 #include "ppapi/c/pp_errors.h"
@@ -30,9 +28,7 @@
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/ppb_char_set_proxy.h"
 #include "ppapi/proxy/ppb_core_proxy.h"
-#include "ppapi/proxy/ppb_cursor_control_proxy.h"
 #include "ppapi/proxy/ppb_font_proxy.h"
-#include "ppapi/proxy/ppb_fullscreen_proxy.h"
 #include "ppapi/proxy/ppb_graphics_2d_proxy.h"
 #include "ppapi/proxy/ppb_image_data_proxy.h"
 #include "ppapi/proxy/ppb_instance_proxy.h"
@@ -214,12 +210,8 @@ InterfaceProxy* Dispatcher::CreateProxyForInterface(
     return new PPB_CharSet_Proxy(this, interface_functions);
   if (interface_name == PPB_CORE_INTERFACE)
     return new PPB_Core_Proxy(this, interface_functions);
-  if (interface_name == PPB_CURSOR_CONTROL_DEV_INTERFACE)
-    return new PPB_CursorControl_Proxy(this, interface_functions);
   if (interface_name == PPB_FONT_DEV_INTERFACE)
     return new PPB_Font_Proxy(this, interface_functions);
-  if (interface_name == PPB_FULLSCREEN_DEV_INTERFACE)
-    return new PPB_Fullscreen_Proxy(this, interface_functions);
   if (interface_name == PPB_GRAPHICS_2D_INTERFACE)
     return new PPB_Graphics2D_Proxy(this, interface_functions);
   if (interface_name == PPB_IMAGEDATA_INTERFACE)

ppapi/proxy/interface_id.h

@@ -14,9 +14,7 @@ enum InterfaceID {
   // Zero is reserved for control messages.
   INTERFACE_ID_PPB_CHAR_SET = 1,
   INTERFACE_ID_PPB_CORE,
-  INTERFACE_ID_PPB_CURSORCONTROL,
   INTERFACE_ID_PPB_FONT,
-  INTERFACE_ID_PPB_FULLSCREEN,
   INTERFACE_ID_PPB_GRAPHICS_2D,
   INTERFACE_ID_PPB_IMAGE_DATA,
   INTERFACE_ID_PPB_INSTANCE,

ppapi/proxy/ppapi_messages_internal.h

@@ -158,26 +158,6 @@ IPC_BEGIN_MESSAGES(PpapiHost)
                              PP_Module /* module */,
                              pp::proxy::SerializedVar /* result */)
 
-  // PPB_CursorControl.
-  IPC_SYNC_MESSAGE_ROUTED4_1(PpapiHostMsg_PPBCursorControl_SetCursor,
-                             PP_Instance /* instance */,
-                             int32_t /* type */,
-                             PP_Resource /* custom_image */,
-                             PP_Point /* hot_spot */,
-                             PP_Bool /* result */)
-  IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBCursorControl_LockCursor,
-                             PP_Instance /* instance */,
-                             PP_Bool /* result */)
-  IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBCursorControl_UnlockCursor,
-                             PP_Instance /* instance */,
-                             PP_Bool /* result */)
-  IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBCursorControl_HasCursorLock,
-                             PP_Instance /* instance */,
-                             PP_Bool /* result */)
-  IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBCursorControl_CanLockCursor,
-                             PP_Instance /* instance */,
-                             PP_Bool /* result */)
-
   // PPB_Font.
   IPC_SYNC_MESSAGE_ROUTED2_3(
       PpapiHostMsg_PPBFont_Create,
@@ -211,14 +191,6 @@ IPC_BEGIN_MESSAGES(PpapiHost)
                              uint32_t /* char_offset */,
                              int32_t /* result */)
 
-  // PPB_Fullscreen.
-  IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBFullscreen_IsFullscreen,
-                             PP_Instance /* instance */,
-                             PP_Bool /* result */)
-  IPC_SYNC_MESSAGE_ROUTED2_1(PpapiHostMsg_PPBFullscreen_SetFullscreen,
-                             PP_Instance /* instance */,
-                             PP_Bool /* fullscreen */,
-                             PP_Bool /* result */)
 
   // PPB_Graphics2D.
   IPC_SYNC_MESSAGE_ROUTED3_1(PpapiHostMsg_PPBGraphics2D_Create,