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

ppapi/proxy/ppb_context_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_context_3d_proxy.h"
 
 #include "base/hash_tables.h"
 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "ppapi/c/pp_errors.h"
@@ skipping 50 matching lines @@
   state.token = s.token;
   state.error = static_cast<gpu::error::Error>(s.error);
   state.generation = s.generation;
   return state;
 }
 
 // Size of the transfer buffer.
 const int32 kCommandBufferSize = 1024 * 1024;
 const int32 kTransferBufferSize = 1024 * 1024;
 
+InterfaceProxy* CreateContext3DProxy(Dispatcher* dispatcher,
+                                     const void* target_interface) {
+  return new PPB_Context3D_Proxy(dispatcher, target_interface);
+}
+
 }  // namespace
 
 class PepperCommandBuffer : public gpu::CommandBuffer {
  public:
   PepperCommandBuffer(const HostResource& resource,
                       PluginDispatcher* dispatcher);
   virtual ~PepperCommandBuffer();
 
   // CommandBuffer implementation:
   virtual bool Initialize(int32 size);
@@ skipping 428 matching lines @@
 void Context3D::UnmapTexSubImage2DCHROMIUM(const void* mem) {
   gles2_impl_->UnmapTexSubImage2DCHROMIUM(mem);
 }
 
 gpu::gles2::GLES2Implementation* Context3D::GetGLES2Impl() {
   return gles2_impl();
 }
 
 // PPB_Context3D_Proxy ---------------------------------------------------------
 
-PPB_Context3D_Proxy::PPB_Context3D_Proxy(Dispatcher* dispatcher)
-    : InterfaceProxy(dispatcher) {
+PPB_Context3D_Proxy::PPB_Context3D_Proxy(Dispatcher* dispatcher,
+                                         const void* target_interface)
+    : InterfaceProxy(dispatcher, target_interface) {
 }
 
 PPB_Context3D_Proxy::~PPB_Context3D_Proxy() {
 }
 
 // static
+const InterfaceProxy::Info* PPB_Context3D_Proxy::GetInfo() {
+  static const Info info = {
+    thunk::GetPPB_Context3D_Thunk(),
+    PPB_CONTEXT_3D_DEV_INTERFACE,
+    INTERFACE_ID_PPB_CONTEXT_3D,
+    false,
+    &CreateContext3DProxy,
+  };
+  return &info;
+}
+
+// static
+const InterfaceProxy::Info* PPB_Context3D_Proxy::GetTextureMappingInfo() {
+  static const Info info = {
+    thunk::GetPPB_GLESChromiumTextureMapping_Thunk(),
+    PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE,
+    INTERFACE_ID_NONE,  // CONTEXT_3D is the canonical one.
+    false,
+    &CreateContext3DProxy,
+  };
+  return &info;
+}
+
+// static
 PP_Resource PPB_Context3D_Proxy::Create(PP_Instance instance,
                                         PP_Config3D_Dev config,
                                         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 47 matching lines @@
   // FIXME(brettw) handle bad messages!
   return handled;
 }
 
 void PPB_Context3D_Proxy::OnMsgCreate(PP_Instance instance,
                                       PP_Config3D_Dev config,
                                       const std::vector<int32_t>& attribs,
                                      HostResource* result) {
   if (attribs.empty() || attribs.back() != 0)
     return;  // Bad message.
-  thunk::EnterResourceCreation enter(instance);
+  EnterFunctionNoLock<ResourceCreationAPI> enter(instance, true);
   if (enter.succeeded()) {
     result->SetHostResource(
         instance,
         enter.functions()->CreateContext3DRaw(instance, config, 0,
                                               &attribs.front()));
   }
 }
 
 void PPB_Context3D_Proxy::OnMsgBindSurfaces(const HostResource& context,
                                             const HostResource& draw,
@@ skipping 87 matching lines @@
   uint32_t shm_size = 0;
   if (enter.succeeded() &&
       enter.object()->GetTransferBuffer(id, &shm_handle, &shm_size)) {
     *transfer_buffer = TransportSHMHandleFromInt(dispatcher(), shm_handle);
     *size = shm_size;
   }
 }
 
 }  // namespace proxy
 }  // namespace ppapi