diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-13 04:00:33 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-13 04:00:33 +0000 |
| commit | 37fe036a2c3e907a5790561e11292904426db144 (patch) | |
| tree | 4b4c928830476c7450ffd5c69ca9f222ddbcfded /ppapi/proxy/ppb_graphics_3d_proxy.cc | |
| parent | ad432d686c8529838448f6639130f1290db9d5a5 (diff) | |
| download | chromium_src-37fe036a2c3e907a5790561e11292904426db144.zip chromium_src-37fe036a2c3e907a5790561e11292904426db144.tar.gz chromium_src-37fe036a2c3e907a5790561e11292904426db144.tar.bz2 | |
Revert r100853, 100851. Win_shared build is broken.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100854 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppb_graphics_3d_proxy.cc')
| -rw-r--r-- | ppapi/proxy/ppb_graphics_3d_proxy.cc | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/ppapi/proxy/ppb_graphics_3d_proxy.cc b/ppapi/proxy/ppb_graphics_3d_proxy.cc index e184ef0..31d9ccb 100644 --- a/ppapi/proxy/ppb_graphics_3d_proxy.cc +++ b/ppapi/proxy/ppb_graphics_3d_proxy.cc @@ -316,6 +316,10 @@ 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) @@ -391,8 +395,9 @@ int32 Graphics3D::DoSwapBuffers() { 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)) { } @@ -400,6 +405,18 @@ 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, @@ -473,7 +490,7 @@ void PPB_Graphics3D_Proxy::OnMsgCreate(PP_Instance instance, 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, |