Index: ppapi/proxy/ppb_graphics_3d_proxy.cc |
diff --git a/ppapi/proxy/ppb_graphics_3d_proxy.cc b/ppapi/proxy/ppb_graphics_3d_proxy.cc |
index 31d9ccb20c3246334d445cf06cacc0eb6fa9df05..e184ef00d7f99ef358eb9113f59d670e72aca7ab 100644 |
--- a/ppapi/proxy/ppb_graphics_3d_proxy.cc |
+++ b/ppapi/proxy/ppb_graphics_3d_proxy.cc |
@@ -316,10 +316,6 @@ gpu::CommandBuffer::State GPUStateFromPPState( |
return state; |
} |
-InterfaceProxy* CreateGraphics3DProxy(Dispatcher* dispatcher, |
- const void* target_interface) { |
- return new PPB_Graphics3D_Proxy(dispatcher, target_interface); |
-} |
} // namespace |
Graphics3D::Graphics3D(const HostResource& resource) |
@@ -395,9 +391,8 @@ int32 Graphics3D::DoSwapBuffers() { |
return PP_OK_COMPLETIONPENDING; |
} |
-PPB_Graphics3D_Proxy::PPB_Graphics3D_Proxy(Dispatcher* dispatcher, |
- const void* target_interface) |
- : InterfaceProxy(dispatcher, target_interface), |
+PPB_Graphics3D_Proxy::PPB_Graphics3D_Proxy(Dispatcher* dispatcher) |
+ : InterfaceProxy(dispatcher), |
callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { |
} |
@@ -405,18 +400,6 @@ 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, |
@@ -490,7 +473,7 @@ void PPB_Graphics3D_Proxy::OnMsgCreate(PP_Instance instance, |
if (attribs.empty() || attribs.back() != PP_GRAPHICS3DATTRIB_NONE) |
return; // Bad message. |
- EnterFunctionNoLock<ResourceCreationAPI> enter(instance, true); |
+ thunk::EnterResourceCreation enter(instance); |
if (enter.succeeded()) { |
result->SetHostResource( |
instance, |