| 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 7725330b63b94c54da55a73feead4e46b636d1f2..ac08224b5063d8f18578ac41367fdd56b7fc3fa7 100644
|
| --- a/ppapi/proxy/ppb_graphics_3d_proxy.cc
|
| +++ b/ppapi/proxy/ppb_graphics_3d_proxy.cc
|
| @@ -48,8 +48,8 @@
|
|
|
| } // namespace
|
|
|
| -Graphics3D::Graphics3D(const HostResource& resource, const gfx::Size& size)
|
| - : PPB_Graphics3D_Shared(resource, size) {
|
| +Graphics3D::Graphics3D(const HostResource& resource)
|
| + : PPB_Graphics3D_Shared(resource) {
|
| }
|
|
|
| Graphics3D::~Graphics3D() {
|
| @@ -118,7 +118,8 @@
|
| }
|
|
|
| int32_t Graphics3D::DoSwapBuffers(const gpu::SyncToken& sync_token,
|
| - const gfx::Size& size) {
|
| + int32_t width,
|
| + int32_t height) {
|
| // A valid sync token would indicate a swap buffer already happened somehow.
|
| DCHECK(!sync_token.HasData());
|
|
|
| @@ -136,7 +137,8 @@
|
| gl->GenSyncTokenCHROMIUM(fence_sync, new_sync_token.GetData());
|
|
|
| IPC::Message* msg = new PpapiHostMsg_PPBGraphics3D_SwapBuffers(
|
| - API_ID_PPB_GRAPHICS_3D, host_resource(), new_sync_token, size);
|
| + API_ID_PPB_GRAPHICS_3D, host_resource(), new_sync_token, width,
|
| + height);
|
| msg->set_unblock(true);
|
| PluginDispatcher::GetForResource(this)->Send(msg);
|
|
|
| @@ -213,8 +215,7 @@
|
| if (result.is_null())
|
| return 0;
|
|
|
| - scoped_refptr<Graphics3D> graphics_3d(
|
| - new Graphics3D(result, attrib_helper.offscreen_framebuffer_size));
|
| + scoped_refptr<Graphics3D> graphics_3d(new Graphics3D(result));
|
| if (!graphics_3d->Init(share_gles2, capabilities, shared_state,
|
| command_buffer_id)) {
|
| return 0;
|
| @@ -360,13 +361,14 @@
|
|
|
| void PPB_Graphics3D_Proxy::OnMsgSwapBuffers(const HostResource& context,
|
| const gpu::SyncToken& sync_token,
|
| - const gfx::Size& size) {
|
| + int32_t width,
|
| + int32_t height) {
|
| EnterHostFromHostResourceForceCallback<PPB_Graphics3D_API> enter(
|
| context, callback_factory_,
|
| &PPB_Graphics3D_Proxy::SendSwapBuffersACKToPlugin, context);
|
| if (enter.succeeded())
|
| enter.SetResult(enter.object()->SwapBuffersWithSyncToken(
|
| - enter.callback(), sync_token, size));
|
| + enter.callback(), sync_token, width, height));
|
| }
|
|
|
| void PPB_Graphics3D_Proxy::OnMsgTakeFrontBuffer(const HostResource& context) {
|
|
|