| Index: ppapi/proxy/ppb_surface_3d_proxy.cc
|
| diff --git a/ppapi/proxy/ppb_surface_3d_proxy.cc b/ppapi/proxy/ppb_surface_3d_proxy.cc
|
| index 23348fcb752aed02cd3c56d69404b01bbf2b4a16..70809da393b5f1e4922a0879b2cfdc614a02d2f1 100644
|
| --- a/ppapi/proxy/ppb_surface_3d_proxy.cc
|
| +++ b/ppapi/proxy/ppb_surface_3d_proxy.cc
|
| @@ -25,9 +25,8 @@ namespace proxy {
|
|
|
| namespace {
|
|
|
| -InterfaceProxy* CreateSurface3DProxy(Dispatcher* dispatcher,
|
| - const void* target_interface) {
|
| - return new PPB_Surface3D_Proxy(dispatcher, target_interface);
|
| +InterfaceProxy* CreateSurface3DProxy(Dispatcher* dispatcher) {
|
| + return new PPB_Surface3D_Proxy(dispatcher);
|
| }
|
|
|
| } // namespace
|
| @@ -88,9 +87,8 @@ void Surface3D::SwapBuffersACK(int32_t pp_error) {
|
|
|
| // PPB_Surface3D_Proxy ---------------------------------------------------------
|
|
|
| -PPB_Surface3D_Proxy::PPB_Surface3D_Proxy(Dispatcher* dispatcher,
|
| - const void* target_interface)
|
| - : InterfaceProxy(dispatcher, target_interface),
|
| +PPB_Surface3D_Proxy::PPB_Surface3D_Proxy(Dispatcher* dispatcher)
|
| + : InterfaceProxy(dispatcher),
|
| callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
|
| }
|
|
|
| @@ -100,7 +98,7 @@ PPB_Surface3D_Proxy::~PPB_Surface3D_Proxy() {
|
| // static
|
| const InterfaceProxy::Info* PPB_Surface3D_Proxy::GetInfo() {
|
| static const Info info = {
|
| - thunk::GetPPB_Surface3D_Thunk(),
|
| + thunk::GetPPB_Surface3D_Dev_Thunk(),
|
| PPB_SURFACE_3D_DEV_INTERFACE,
|
| INTERFACE_ID_PPB_SURFACE_3D,
|
| false,
|
| @@ -162,7 +160,7 @@ void PPB_Surface3D_Proxy::OnMsgCreate(PP_Instance instance,
|
| attribs.back() != PP_GRAPHICS3DATTRIB_NONE)
|
| return; // Bad message.
|
|
|
| - EnterFunctionNoLock<ResourceCreationAPI> enter(instance, true);
|
| + thunk::EnterResourceCreation enter(instance);
|
| if (enter.succeeded()) {
|
| result->SetHostResource(
|
| instance,
|
|
|