Revert 100748 - This patch tries to remove most of the manual registration for Pepper interfaces,...

ppapi/proxy/ppb_graphics_3d_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/ppb_graphics_3d_proxy.h"
 
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/proxy/enter_proxy.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
@@ skipping 298 matching lines @@
   gpu::CommandBuffer::State state;
   state.num_entries = s.num_entries;
   state.get_offset = s.get_offset;
   state.put_offset = s.put_offset;
   state.token = s.token;
   state.error = static_cast<gpu::error::Error>(s.error);
   state.generation = s.generation;
   return state;
 }
 
+InterfaceProxy* CreateGraphics3DProxy(Dispatcher* dispatcher,
+                                      const void* target_interface) {
+  return new PPB_Graphics3D_Proxy(dispatcher, target_interface);
+}
 }  // namespace
 
 Graphics3D::Graphics3D(const HostResource& resource)
     : Resource(resource) {
 }
 
 Graphics3D::~Graphics3D() {
   DestroyGLES2Impl();
 }
 
@@ skipping 55 matching lines @@
 int32 Graphics3D::DoSwapBuffers() {
   IPC::Message* msg = new PpapiHostMsg_PPBGraphics3D_SwapBuffers(
       INTERFACE_ID_PPB_GRAPHICS_3D, host_resource());
   msg->set_unblock(true);
   PluginDispatcher::GetForResource(this)->Send(msg);
 
   gles2_impl()->SwapBuffers();
   return PP_OK_COMPLETIONPENDING;
 }
 
-PPB_Graphics3D_Proxy::PPB_Graphics3D_Proxy(Dispatcher* dispatcher)
-    : InterfaceProxy(dispatcher),
+PPB_Graphics3D_Proxy::PPB_Graphics3D_Proxy(Dispatcher* dispatcher,
+                                           const void* target_interface)
+    : InterfaceProxy(dispatcher, target_interface),
       callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
 
 PPB_Graphics3D_Proxy::~PPB_Graphics3D_Proxy() {
 }
 
 // static
+const InterfaceProxy::Info* PPB_Graphics3D_Proxy::GetInfo() {
+  static const Info info = {
+    thunk::GetPPB_Graphics3D_Thunk(),
+    PPB_GRAPHICS_3D_INTERFACE,
+    INTERFACE_ID_PPB_GRAPHICS_3D,
+    false,
+    &CreateGraphics3DProxy,
+  };
+  return &info;
+}
+
+// static
 PP_Resource PPB_Graphics3D_Proxy::CreateProxyResource(
     PP_Instance instance,
     PP_Resource share_context,
     const int32_t* attrib_list) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return PP_ERROR_BADARGUMENT;
 
   // TODO(alokp): Support shared context.
   DCHECK_EQ(0, share_context);
@@ skipping 53 matching lines @@
   // FIXME(brettw) handle bad messages!
   return handled;
 }
 
 void PPB_Graphics3D_Proxy::OnMsgCreate(PP_Instance instance,
                                        const std::vector<int32_t>& attribs,
                                        HostResource* result) {
   if (attribs.empty() || attribs.back() != PP_GRAPHICS3DATTRIB_NONE)
     return;  // Bad message.
 
-  thunk::EnterResourceCreation enter(instance);
+  EnterFunctionNoLock<ResourceCreationAPI> enter(instance, true);
   if (enter.succeeded()) {
     result->SetHostResource(
         instance,
         enter.functions()->CreateGraphics3DRaw(instance, 0, &attribs.front()));
   }
 }
 
 void PPB_Graphics3D_Proxy::OnMsgInitCommandBuffer(
     const HostResource& context,
     int32 size,
@@ skipping 96 matching lines @@
 void PPB_Graphics3D_Proxy::SendSwapBuffersACKToPlugin(
     int32_t result,
     const HostResource& context) {
   dispatcher()->Send(new PpapiMsg_PPBGraphics3D_SwapBuffersACK(
       INTERFACE_ID_PPB_GRAPHICS_3D, context, result));
 }
 
 }  // namespace proxy
 }  // namespace ppapi