Convert dev interfaces to use the macro system.

This converts the non-"weird" dev interfaces to using the macro system. The
trusted and private ones are still remaining.

This moves the find implementation to the instance API which saves some code
and routing.

Review URL: http://codereview.chromium.org/7887021

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

16 files changed, 55 insertions, 89 deletions

diff --git a/ppapi/ppapi_shared.gypi b/ppapi/ppapi_shared.gypi
index b029721..4ae1078 100644
--- a/ppapi/ppapi_shared.gypi
+++ b/ppapi/ppapi_shared.gypi
@@ -119,7 +119,6 @@
         'thunk/ppb_file_ref_thunk.cc',
         'thunk/ppb_file_system_api.h',
         'thunk/ppb_file_system_thunk.cc',
-        'thunk/ppb_find_api.h',
         'thunk/ppb_find_thunk.cc',
         'thunk/ppb_flash_menu_api.h',
         'thunk/ppb_flash_menu_thunk.cc',
diff --git a/ppapi/proxy/interface_id.h b/ppapi/proxy/interface_id.h
index 3b43943..1254adc 100644
--- a/ppapi/proxy/interface_id.h
+++ b/ppapi/proxy/interface_id.h
@@ -25,7 +25,6 @@ enum InterfaceID {
   INTERFACE_ID_PPB_FILE_CHOOSER,
   INTERFACE_ID_PPB_FILE_REF,
   INTERFACE_ID_PPB_FILE_SYSTEM,
-  INTERFACE_ID_PPB_FIND,
   INTERFACE_ID_PPB_FLASH,
   INTERFACE_ID_PPB_FLASH_CLIPBOARD,
   INTERFACE_ID_PPB_FLASH_FILE_FILEREF,
diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc
index 0b386aa..87bc815 100644
--- a/ppapi/proxy/interface_list.cc
+++ b/ppapi/proxy/interface_list.cc
@@ -181,7 +181,6 @@ InterfaceList::InterfaceList() {
   AddPPB(PPB_Flash_Menu_Proxy::GetInfo());
   AddPPB(PPB_Flash_Proxy::GetInfo());
   AddPPB(PPB_Flash_TCPSocket_Proxy::GetInfo());
-  AddPPB(PPB_Instance_Proxy::GetInfoFullscreen());
   AddPPB(PPB_Instance_Proxy::GetInfoPrivate());
   AddPPB(PPB_PDF_Proxy::GetInfo());
   AddPPB(PPB_Testing_Proxy::GetInfo());
diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc
index 5dcf713..e08e73a 100644
--- a/ppapi/proxy/ppb_instance_proxy.cc
+++ b/ppapi/proxy/ppb_instance_proxy.cc
@@ -59,18 +59,6 @@ const InterfaceProxy::Info* PPB_Instance_Proxy::GetInfoPrivate() {
   return &info;
 }
 
-// static
-const InterfaceProxy::Info* PPB_Instance_Proxy::GetInfoFullscreen() {
-  static const Info info = {
-    ppapi::thunk::GetPPB_Fullscreen_Thunk(),
-    PPB_FULLSCREEN_DEV_INTERFACE,
-    INTERFACE_ID_NONE,  // 1_0 is the canonical one.
-    false,
-    &CreateInstanceProxy,
-  };
-  return &info;
-}
-
 bool PPB_Instance_Proxy::OnMessageReceived(const IPC::Message& msg) {
   // Prevent the dispatcher from going away during a call to ExecuteScript.
   // This must happen OUTSIDE of ExecuteScript since the SerializedVars use
@@ -183,6 +171,17 @@ void PPB_Instance_Proxy::LogWithSource(PP_Instance instance,
       SerializedVarSendInput(dispatcher(), value)));
 }
 
+void PPB_Instance_Proxy::NumberOfFindResultsChanged(PP_Instance instance,
+                                                    int32_t total,
+                                                    PP_Bool final_result) {
+  NOTIMPLEMENTED();  // Not proxied yet.
+}
+
+void PPB_Instance_Proxy::SelectedFindResultChanged(PP_Instance instance,
+                                                   int32_t index) {
+  NOTIMPLEMENTED();  // Not proxied yet.
+}
+
 PP_Bool PPB_Instance_Proxy::IsFullscreen(PP_Instance instance) {
   InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())->
       GetInstanceData(instance);
diff --git a/ppapi/proxy/ppb_instance_proxy.h b/ppapi/proxy/ppb_instance_proxy.h
index 4199912..74784a1 100644
--- a/ppapi/proxy/ppb_instance_proxy.h
+++ b/ppapi/proxy/ppb_instance_proxy.h
@@ -29,7 +29,6 @@ class PPB_Instance_Proxy : public InterfaceProxy,
   virtual ~PPB_Instance_Proxy();
 
   static const Info* GetInfoPrivate();
-  static const Info* GetInfoFullscreen();
 
   // InterfaceProxy implementation.
   virtual bool OnMessageReceived(const IPC::Message& msg);
@@ -53,6 +52,11 @@ class PPB_Instance_Proxy : public InterfaceProxy,
                              int log_level,
                              PP_Var source,
                              PP_Var value) OVERRIDE;
+  virtual void NumberOfFindResultsChanged(PP_Instance instance,
+                                          int32_t total,
+                                          PP_Bool final_result) OVERRIDE;
+  virtual void SelectedFindResultChanged(PP_Instance instance,
+                                         int32_t index) OVERRIDE;
   virtual PP_Bool IsFullscreen(PP_Instance instance) OVERRIDE;
   virtual PP_Bool SetFullscreen(PP_Instance instance,
                                 PP_Bool fullscreen) OVERRIDE;
diff --git a/ppapi/shared_impl/function_group_base.h b/ppapi/shared_impl/function_group_base.h
index 31b164f..94d4140 100644
--- a/ppapi/shared_impl/function_group_base.h
+++ b/ppapi/shared_impl/function_group_base.h
@@ -12,7 +12,6 @@
 #define FOR_ALL_PPAPI_FUNCTION_APIS(F) \
   F(PPB_CharSet_FunctionAPI) \
   F(PPB_CursorControl_FunctionAPI) \
-  F(PPB_Find_FunctionAPI) \
   F(PPB_Font_FunctionAPI) \
   F(PPB_Fullscreen_FunctionAPI) \
   F(PPB_Instance_FunctionAPI) \
diff --git a/ppapi/thunk/interfaces_ppb_public_dev.h b/ppapi/thunk/interfaces_ppb_public_dev.h
index 3e202a5..9f164db 100644
--- a/ppapi/thunk/interfaces_ppb_public_dev.h
+++ b/ppapi/thunk/interfaces_ppb_public_dev.h
@@ -11,12 +11,17 @@ PROXIED_API(PPB_Buffer)
 PROXIED_API(PPB_CharSet)
 PROXIED_API(PPB_Context3D)
 PROXIED_API(PPB_CursorControl)
+UNPROXIED_API(PPB_DirectoryReader)
 PROXIED_API(PPB_FileChooser)
 PROXIED_API(PPB_Font)
 PROXIED_API(PPB_Graphics3D)
+UNPROXIED_API(PPB_LayerCompositor)
+UNPROXIED_API(PPB_Scrollbar)
 PROXIED_API(PPB_Surface3D)
+UNPROXIED_API(PPB_Transport)
 PROXIED_API(PPB_VideoCapture)
 PROXIED_API(PPB_VideoDecoder)
+UNPROXIED_API(PPB_Widget)
 
 PROXIED_IFACE(PPB_Buffer, PPB_BUFFER_DEV_INTERFACE_0_4, PPB_Buffer_Dev)
 PROXIED_IFACE(PPB_CharSet, PPB_CHAR_SET_DEV_INTERFACE_0_4, PPB_CharSet_Dev)
@@ -26,17 +31,33 @@ PROXIED_IFACE(PPB_Context3D, PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE,
               PPB_GLESChromiumTextureMapping_Dev)
 PROXIED_IFACE(PPB_CursorControl, PPB_CURSOR_CONTROL_DEV_INTERFACE_0_4,
               PPB_CursorControl_Dev)
+UNPROXIED_IFACE(PPB_DirectoryReader, PPB_DIRECTORYREADER_DEV_INTERFACE_0_5,
+                PPB_DirectoryReader_Dev)
+UNPROXIED_IFACE(PPB_Find, PPB_FIND_DEV_INTERFACE_0_3, PPB_Find_Dev)
 PROXIED_IFACE(PPB_FileChooser, PPB_FILECHOOSER_DEV_INTERFACE_0_5,
               PPB_FileChooser_Dev)
 PROXIED_IFACE(PPB_Font, PPB_FONT_DEV_INTERFACE_0_6, PPB_Font_Dev)
 PROXIED_IFACE(PPB_Instance, PPB_CONSOLE_DEV_INTERFACE, PPB_Console_Dev)
+UNPROXIED_IFACE(PPB_Instance, PPB_FULLSCREEN_DEV_INTERFACE, PPB_Fullscreen_Dev)
 PROXIED_IFACE(PPB_Instance, PPB_MOUSELOCK_DEV_INTERFACE_0_1,
               PPB_MouseLock_Dev)
+UNPROXIED_IFACE(PPB_Instance, PPB_QUERY_POLICY_DEV_INTERFACE_0_1,
+                PPB_QueryPolicy_Dev)
+UNPROXIED_IFACE(PPB_Instance, PPB_ZOOM_DEV_INTERFACE_0_2, PPB_Zoom_Dev)
+UNPROXIED_IFACE(PPB_LayerCompositor, PPB_LAYER_COMPOSITOR_DEV_INTERFACE_0_2,
+                PPB_LayerCompositor_Dev)
+UNPROXIED_IFACE(PPB_Scrollbar, PPB_SCROLLBAR_DEV_INTERFACE_0_5,
+                PPB_Scrollbar_0_5_Dev)
 PROXIED_IFACE(PPB_Surface3D, PPB_SURFACE_3D_DEV_INTERFACE_0_2,
               PPB_Surface3D_Dev)
+UNPROXIED_IFACE(PPB_Transport, PPB_TRANSPORT_DEV_INTERFACE_0_6,
+                PPB_Transport_Dev)
 PROXIED_IFACE(PPB_VideoCapture, PPB_VIDEO_CAPTURE_DEV_INTERFACE_0_1,
               PPB_VideoCapture_Dev)
 PROXIED_IFACE(PPB_VideoDecoder, PPB_VIDEODECODER_DEV_INTERFACE_0_16,
               PPB_VideoDecoder_Dev)
+UNPROXIED_IFACE(PPB_VideoLayer, PPB_VIDEOLAYER_DEV_INTERFACE,
+                PPB_VideoLayer_Dev)
+UNPROXIED_IFACE(PPB_Widget, PPB_WIDGET_DEV_INTERFACE_0_3, PPB_Widget_Dev)
 
 #include "ppapi/thunk/interfaces_postamble.h"
diff --git a/ppapi/thunk/ppb_find_api.h b/ppapi/thunk/ppb_find_api.h
deleted file mode 100644
index aacd77e..0000000
--- a/ppapi/thunk/ppb_find_api.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef PPAPI_THUNK_PPB_FIND_API_H_
-#define PPAPI_THUNK_PPB_FIND_API_H_
-
-#include "ppapi/c/dev/ppb_find_dev.h"
-#include "ppapi/proxy/interface_id.h"
-
-namespace ppapi {
-namespace thunk {
-
-class PPB_Find_FunctionAPI {
- public:
-  virtual ~PPB_Find_FunctionAPI() {}
-
-  virtual void NumberOfFindResultsChanged(PP_Instance instance,
-                                          int32_t total,
-                                          PP_Bool final_result) = 0;
-  virtual void SelectedFindResultChanged(PP_Instance instance,
-                                         int32_t index) = 0;
-
-  static const proxy::InterfaceID interface_id = proxy::INTERFACE_ID_PPB_FIND;
-};
-
-}  // namespace thunk
-}  // namespace ppapi
-
-#endif  // PPAPI_THUNK_PPB_FIND_API_H_
diff --git a/ppapi/thunk/ppb_find_thunk.cc b/ppapi/thunk/ppb_find_thunk.cc
index e37e8ed..82faa3c 100644
--- a/ppapi/thunk/ppb_find_thunk.cc
+++ b/ppapi/thunk/ppb_find_thunk.cc
@@ -5,8 +5,6 @@
 #include "ppapi/c/dev/ppb_find_dev.h"
 #include "ppapi/thunk/thunk.h"
 #include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_find_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
 
 namespace ppapi {
 namespace thunk {
@@ -16,13 +14,13 @@ namespace {
 void NumberOfFindResultsChanged(PP_Instance instance,
                                 int32_t total,
                                 PP_Bool final) {
-  EnterFunction<PPB_Find_FunctionAPI> enter(instance, true);
+  EnterInstance enter(instance);
   if (enter.succeeded())
     enter.functions()->NumberOfFindResultsChanged(instance, total, final);
 }
 
 void SelectedFindResultChanged(PP_Instance instance, int32_t index) {
-  EnterFunction<PPB_Find_FunctionAPI> enter(instance, true);
+  EnterInstance enter(instance);
   if (enter.succeeded())
     enter.functions()->SelectedFindResultChanged(instance, index);
 }
@@ -34,7 +32,7 @@ const PPB_Find_Dev g_ppb_find_thunk = {
 
 }  // namespace
 
-const PPB_Find_Dev* GetPPB_Find_Thunk() {
+const PPB_Find_Dev* GetPPB_Find_Dev_Thunk() {
   return &g_ppb_find_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_fullscreen_thunk.cc b/ppapi/thunk/ppb_fullscreen_thunk.cc
index 5cc8cc6..72081f5 100644
--- a/ppapi/thunk/ppb_fullscreen_thunk.cc
+++ b/ppapi/thunk/ppb_fullscreen_thunk.cc
@@ -42,7 +42,7 @@ const PPB_Fullscreen_Dev g_ppb_fullscreen_thunk = {
 
 }  // namespace
 
-const PPB_Fullscreen_Dev* GetPPB_Fullscreen_Thunk() {
+const PPB_Fullscreen_Dev* GetPPB_Fullscreen_Dev_Thunk() {
   return &g_ppb_fullscreen_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_instance_api.h b/ppapi/thunk/ppb_instance_api.h
index 9a5628b..0af3f91 100644
--- a/ppapi/thunk/ppb_instance_api.h
+++ b/ppapi/thunk/ppb_instance_api.h
@@ -38,6 +38,13 @@ class PPB_Instance_FunctionAPI {
                              PP_Var source,
                              PP_Var value) = 0;
 
+  // Find.
+  virtual void NumberOfFindResultsChanged(PP_Instance instance,
+                                          int32_t total,
+                                          PP_Bool final_result) = 0;
+  virtual void SelectedFindResultChanged(PP_Instance instance,
+                                         int32_t index) = 0;
+
   // Fullscreen.
   virtual PP_Bool IsFullscreen(PP_Instance instance) = 0;
   virtual PP_Bool SetFullscreen(PP_Instance instance, PP_Bool fullscreen) = 0;
diff --git a/ppapi/thunk/ppb_layer_compositor_thunk.cc b/ppapi/thunk/ppb_layer_compositor_thunk.cc
index 783ad4d..44a95eb 100644
--- a/ppapi/thunk/ppb_layer_compositor_thunk.cc
+++ b/ppapi/thunk/ppb_layer_compositor_thunk.cc
@@ -63,7 +63,7 @@ const PPB_LayerCompositor_Dev g_ppb_layer_compositor_thunk = {
 
 }  // namespace
 
-const PPB_LayerCompositor_Dev* GetPPB_LayerCompositor_Thunk() {
+const PPB_LayerCompositor_Dev* GetPPB_LayerCompositor_Dev_Thunk() {
   return &g_ppb_layer_compositor_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_query_policy_thunk.cc b/ppapi/thunk/ppb_query_policy_thunk.cc
index 468704b..24ef43b 100644
--- a/ppapi/thunk/ppb_query_policy_thunk.cc
+++ b/ppapi/thunk/ppb_query_policy_thunk.cc
@@ -25,7 +25,7 @@ const PPB_QueryPolicy_Dev g_ppb_querypolicy_thunk = {
 
 }  // namespace
 
-const PPB_QueryPolicy_Dev* GetPPB_QueryPolicy_Thunk() {
+const PPB_QueryPolicy_Dev* GetPPB_QueryPolicy_Dev_Thunk() {
   return &g_ppb_querypolicy_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_scrollbar_thunk.cc b/ppapi/thunk/ppb_scrollbar_thunk.cc
index 6e66483..dd0a9bb 100644
--- a/ppapi/thunk/ppb_scrollbar_thunk.cc
+++ b/ppapi/thunk/ppb_scrollbar_thunk.cc
@@ -87,7 +87,7 @@ const PPB_Scrollbar_0_5_Dev g_ppb_scrollbar_thunk = {
 
 }  // namespace
 
-const PPB_Scrollbar_0_5_Dev* GetPPB_Scrollbar_Thunk() {
+const PPB_Scrollbar_0_5_Dev* GetPPB_Scrollbar_0_5_Dev_Thunk() {
   return &g_ppb_scrollbar_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_zoom_thunk.cc b/ppapi/thunk/ppb_zoom_thunk.cc
index e7e5236..699ad80 100644
--- a/ppapi/thunk/ppb_zoom_thunk.cc
+++ b/ppapi/thunk/ppb_zoom_thunk.cc
@@ -35,7 +35,7 @@ const PPB_Zoom_Dev g_ppb_zoom_thunk = {
 
 }  // namespace
 
-const PPB_Zoom_Dev* GetPPB_Zoom_Thunk() {
+const PPB_Zoom_Dev* GetPPB_Zoom_Dev_Thunk() {
   return &g_ppb_zoom_thunk;
 }
 
diff --git a/ppapi/thunk/thunk.h b/ppapi/thunk/thunk.h
index 47d3660..c10c248 100644
--- a/ppapi/thunk/thunk.h
+++ b/ppapi/thunk/thunk.h
@@ -28,72 +28,43 @@
 
 struct PPB_AudioTrusted;
 struct PPB_BrokerTrusted;
-struct PPB_Buffer_Dev;
 struct PPB_BufferTrusted;
-struct PPB_CharSet_Dev;
-struct PPB_Console_Dev;
 struct PPB_Context3DTrusted_Dev;
-struct PPB_CursorControl_Dev;
-struct PPB_DirectoryReader_Dev;
-struct PPB_FileChooser_Dev;
 struct PPB_FileIOTrusted;
-struct PPB_Find_Dev;
 struct PPB_Flash_Menu;
 struct PPB_Flash_NetConnector;
 struct PPB_Flash_TCPSocket;
-struct PPB_Font_Dev;
-struct PPB_Fullscreen_Dev;
 struct PPB_Graphics3D;
 struct PPB_Graphics3DTrusted;
-struct PPB_ImageData;
 struct PPB_ImageDataTrusted;
 struct PPB_Instance_Private;
-struct PPB_LayerCompositor_Dev;
 struct PPB_QueryPolicy_Dev;
-struct PPB_Scrollbar_0_5_Dev;
-struct PPB_Surface3D_Dev;
-struct PPB_Transport_Dev;
 struct PPB_URLLoaderTrusted;
-struct PPB_VideoCapture_Dev;
-struct PPB_VideoDecoder_Dev;
-struct PPB_VideoLayer_Dev;
-struct PPB_Widget_Dev;
-struct PPB_Zoom_Dev;
 
 typedef PPB_Instance PPB_Instance_1_0;
 
 namespace ppapi {
 namespace thunk {
 
+// Old-style thunk getters. Only put trusted/private stuff here (it hasn't
+// yet been converted to the new system). Otherwise, add the declaration to
+// the appropriate interfaces_*.h file.
 PPAPI_THUNK_EXPORT const PPB_AudioTrusted* GetPPB_AudioTrusted_Thunk();
 PPAPI_THUNK_EXPORT const PPB_BrokerTrusted* GetPPB_Broker_Thunk();
 PPAPI_THUNK_EXPORT const PPB_BufferTrusted* GetPPB_BufferTrusted_Thunk();
-PPAPI_THUNK_EXPORT const PPB_Console_Dev* GetPPB_Console_Dev_Thunk();
 PPAPI_THUNK_EXPORT const PPB_Context3DTrusted_Dev*
     GetPPB_Context3DTrusted_Thunk();
-PPAPI_THUNK_EXPORT const PPB_CursorControl_Dev* GetPPB_CursorControl_Thunk();
-PPAPI_THUNK_EXPORT const PPB_DirectoryReader_Dev*
-    GetPPB_DirectoryReader_Dev_Thunk();
 PPAPI_THUNK_EXPORT const PPB_FileIOTrusted* GetPPB_FileIOTrusted_Thunk();
-PPAPI_THUNK_EXPORT const PPB_Find_Dev* GetPPB_Find_Thunk();
 PPAPI_THUNK_EXPORT const PPB_Flash_Menu* GetPPB_Flash_Menu_Thunk();
 PPAPI_THUNK_EXPORT const PPB_Flash_NetConnector*
     GetPPB_Flash_NetConnector_Thunk();
 PPAPI_THUNK_EXPORT const PPB_Flash_TCPSocket* GetPPB_Flash_TCPSocket_Thunk();
-PPAPI_THUNK_EXPORT const PPB_Fullscreen_Dev* GetPPB_Fullscreen_Thunk();
 PPAPI_THUNK_EXPORT const PPB_Graphics3DTrusted*
     GetPPB_Graphics3DTrusted_Thunk();
 PPAPI_THUNK_EXPORT const PPB_ImageDataTrusted* GetPPB_ImageDataTrusted_Thunk();
 PPAPI_THUNK_EXPORT const PPB_Instance_Private* GetPPB_Instance_Private_Thunk();
-PPAPI_THUNK_EXPORT const PPB_LayerCompositor_Dev*
-    GetPPB_LayerCompositor_Thunk();
 PPAPI_THUNK_EXPORT const PPB_QueryPolicy_Dev* GetPPB_QueryPolicy_Thunk();
-PPAPI_THUNK_EXPORT const PPB_Scrollbar_0_5_Dev* GetPPB_Scrollbar_Thunk();
-PPAPI_THUNK_EXPORT const PPB_Transport_Dev* GetPPB_Transport_Dev_Thunk();
 PPAPI_THUNK_EXPORT const PPB_URLLoaderTrusted* GetPPB_URLLoaderTrusted_Thunk();
-PPAPI_THUNK_EXPORT const PPB_VideoLayer_Dev* GetPPB_VideoLayer_Dev_Thunk();
-PPAPI_THUNK_EXPORT const PPB_Widget_Dev* GetPPB_Widget_Dev_Thunk();
-PPAPI_THUNK_EXPORT const PPB_Zoom_Dev* GetPPB_Zoom_Thunk();
 
 }  // namespace thunk
 }  // namespace ppapi