This patch tries to remove most of the manual registration for Pepper interfaces, and replaces it...

ppapi/proxy/ppp_instance_proxy.cc

 // 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.
 
 #include "ppapi/proxy/ppp_instance_proxy.h"
 
 #include <algorithm>
 
 #include "ppapi/c/dev/ppb_fullscreen_dev.h"
 #include "ppapi/c/pp_var.h"
@@ skipping 32 matching lines @@
   HostDispatcher::GetForInstance(instance)->Send(
       new PpapiMsg_PPPInstance_DidDestroy(INTERFACE_ID_PPP_INSTANCE, instance));
 }
 
 void DidChangeView(PP_Instance instance,
                    const PP_Rect* position,
                    const PP_Rect* clip) {
   HostDispatcher* dispatcher = HostDispatcher::GetForInstance(instance);
   const PPB_Fullscreen_Dev* fullscreen_interface =
       static_cast<const PPB_Fullscreen_Dev*>(
-          dispatcher->GetLocalInterface(PPB_FULLSCREEN_DEV_INTERFACE));
+          dispatcher->local_get_interface()(PPB_FULLSCREEN_DEV_INTERFACE));
   DCHECK(fullscreen_interface);
   PP_Bool fullscreen = fullscreen_interface->IsFullscreen(instance);
   dispatcher->Send(
       new PpapiMsg_PPPInstance_DidChangeView(INTERFACE_ID_PPP_INSTANCE,
                                              instance, *position, *clip,
                                              fullscreen));
 }
 
 void DidChangeFocus(PP_Instance instance, PP_Bool has_focus) {
   HostDispatcher::GetForInstance(instance)->Send(
       new PpapiMsg_PPPInstance_DidChangeFocus(INTERFACE_ID_PPP_INSTANCE,
                                               instance, has_focus));
 }
 
 PP_Bool HandleDocumentLoad(PP_Instance instance,
                            PP_Resource url_loader) {
   PP_Bool result = PP_FALSE;
   HostDispatcher* dispatcher = HostDispatcher::GetForInstance(instance);
 
   // Set up the URLLoader for proxying.
 
   PPB_URLLoader_Proxy* url_loader_proxy = static_cast<PPB_URLLoader_Proxy*>(
-      dispatcher->GetOrCreatePPBInterfaceProxy(INTERFACE_ID_PPB_URL_LOADER));
+      dispatcher->GetInterfaceProxy(INTERFACE_ID_PPB_URL_LOADER));
   url_loader_proxy->PrepareURLLoaderForSendingToPlugin(url_loader);
 
   // PluginResourceTracker in the plugin process assumes that resources that it
   // tracks have been addrefed on behalf of the plugin at the renderer side. So
   // we explicitly do it for |url_loader| here.
   //
   // Please also see comments in PPP_Instance_Proxy::OnMsgHandleDocumentLoad()
   // about releasing of this extra reference.
   const PPB_Core* core = reinterpret_cast<const PPB_Core*>(
-      dispatcher->GetLocalInterface(PPB_CORE_INTERFACE));
+      dispatcher->local_get_interface()(PPB_CORE_INTERFACE));
   if (!core) {
     NOTREACHED();
     return PP_FALSE;
   }
   core->AddRefResource(url_loader);
 
   HostResource serialized_loader;
   serialized_loader.SetHostResource(instance, url_loader);
   dispatcher->Send(new PpapiMsg_PPPInstance_HandleDocumentLoad(
       INTERFACE_ID_PPP_INSTANCE, instance, serialized_loader, &result));
   return result;
 }
 
 static const PPP_Instance_1_0 instance_interface_1_0 = {
   &DidCreate,
   &DidDestroy,
   &DidChangeView,
   &DidChangeFocus,
   &HandleDocumentLoad
 };
 
-template <class PPP_Instance_Type>
-InterfaceProxy* CreateInstanceProxy(Dispatcher* dispatcher,
-                                    const void* target_interface) {
-  return new PPP_Instance_Proxy(
-      dispatcher,
-      static_cast<const PPP_Instance_Type*>(target_interface));
+InterfaceProxy* CreateInstanceProxy(Dispatcher* dispatcher) {
+  return new PPP_Instance_Proxy(dispatcher);
 }
 
 }  // namespace
 
+PPP_Instance_Proxy::PPP_Instance_Proxy(Dispatcher* dispatcher)
+    : InterfaceProxy(dispatcher) {
+  if (dispatcher->IsPlugin()) {
+    combined_interface_.reset(
+        new PPP_Instance_Combined(*static_cast<const PPP_Instance_1_0*>(
+            dispatcher->local_get_interface()(PPP_INSTANCE_INTERFACE_1_0))));
+  }
+}
+
 PPP_Instance_Proxy::~PPP_Instance_Proxy() {
 }
 
 // static
 const InterfaceProxy::Info* PPP_Instance_Proxy::GetInfo1_0() {
   static const Info info = {
     &instance_interface_1_0,
     PPP_INSTANCE_INTERFACE_1_0,
     INTERFACE_ID_PPP_INSTANCE,
     false,
-    &CreateInstanceProxy<PPP_Instance_1_0>,
+    &CreateInstanceProxy
   };
   return &info;
 }
 
 bool PPP_Instance_Proxy::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PPP_Instance_Proxy, msg)
     IPC_MESSAGE_HANDLER(PpapiMsg_PPPInstance_DidCreate,
                         OnMsgDidCreate)
     IPC_MESSAGE_HANDLER(PpapiMsg_PPPInstance_DidDestroy,
@@ skipping 80 matching lines @@
   // with. The plugin will normally take an additional reference which will keep
   // the resource alive in the plugin (and the one reference in the renderer
   // representing all plugin references).
   // Once all references at the plugin side are released, the renderer side will
   // be notified and release the reference added in HandleDocumentLoad() above.
   PluginResourceTracker::GetInstance()->ReleaseResource(plugin_loader);
 }
 
 }  // namespace proxy
 }  // namespace ppapi