| 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 0c21e377733751873561ff42642fd1df3a818fba..ca29adc29bdfca26847a6a3d13cae1fd8d6d6f68 100644
|
| --- a/ppapi/proxy/ppb_graphics_3d_proxy.cc
|
| +++ b/ppapi/proxy/ppb_graphics_3d_proxy.cc
|
| @@ -117,7 +117,9 @@ gpu::GpuControl* Graphics3D::GetGpuControl() {
|
| return command_buffer_.get();
|
| }
|
|
|
| -int32_t Graphics3D::DoSwapBuffers(const gpu::SyncToken& sync_token) {
|
| +int32_t Graphics3D::DoSwapBuffers(const gpu::SyncToken& sync_token,
|
| + int32_t width,
|
| + int32_t height) {
|
| // A valid sync token would indicate a swap buffer already happened somehow.
|
| DCHECK(!sync_token.HasData());
|
|
|
| @@ -135,7 +137,8 @@ int32_t Graphics3D::DoSwapBuffers(const gpu::SyncToken& sync_token) {
|
| 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);
|
| + API_ID_PPB_GRAPHICS_3D, host_resource(), new_sync_token, width,
|
| + height);
|
| msg->set_unblock(true);
|
| PluginDispatcher::GetForResource(this)->Send(msg);
|
|
|
| @@ -347,13 +350,15 @@ void PPB_Graphics3D_Proxy::OnMsgDestroyTransferBuffer(
|
| }
|
|
|
| void PPB_Graphics3D_Proxy::OnMsgSwapBuffers(const HostResource& context,
|
| - const gpu::SyncToken& sync_token) {
|
| + const gpu::SyncToken& sync_token,
|
| + 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));
|
| + enter.SetResult(enter.object()->SwapBuffersWithSyncToken(
|
| + enter.callback(), sync_token, width, height));
|
| }
|
|
|
| void PPB_Graphics3D_Proxy::OnMsgTakeFrontBuffer(const HostResource& context) {
|
|
|