| Index: ppapi/proxy/compositor_resource.cc
|
| diff --git a/ppapi/proxy/compositor_resource.cc b/ppapi/proxy/compositor_resource.cc
|
| index 443d7a949e977bab3394e8e7c0fe181d02eed7ac..338b7bf160ab58653a51b3fb449de9dc287259dd 100644
|
| --- a/ppapi/proxy/compositor_resource.cc
|
| +++ b/ppapi/proxy/compositor_resource.cc
|
| @@ -36,7 +36,7 @@ CompositorResource::~CompositorResource() {
|
| for (ReleaseCallbackMap::iterator it = release_callback_map_.begin();
|
| it != release_callback_map_.end(); ++it) {
|
| if (!it->second.is_null())
|
| - it->second.Run(PP_ERROR_ABORTED, 0, false);
|
| + it->second.Run(PP_ERROR_ABORTED, 0, gpu::SyncToken(), false);
|
| }
|
| }
|
|
|
| @@ -127,11 +127,12 @@ void CompositorResource::OnPluginMsgReleaseResource(
|
| const ResourceMessageReplyParams& params,
|
| int32_t id,
|
| uint32_t sync_point,
|
| + const gpu::SyncToken& sync_token,
|
| bool is_lost) {
|
| ReleaseCallbackMap::iterator it = release_callback_map_.find(id);
|
| DCHECK(it != release_callback_map_.end()) <<
|
| "Can not found release_callback_ by id(" << id << ")!";
|
| - it->second.Run(PP_OK, sync_point, is_lost);
|
| + it->second.Run(PP_OK, sync_point, sync_token, is_lost);
|
| release_callback_map_.erase(it);
|
| }
|
|
|
| @@ -140,7 +141,8 @@ void CompositorResource::ResetLayersInternal(bool is_aborted) {
|
| it != layers_.end(); ++it) {
|
| ReleaseCallback release_callback = (*it)->release_callback();
|
| if (!release_callback.is_null()) {
|
| - release_callback.Run(is_aborted ? PP_ERROR_ABORTED : PP_OK, 0, false);
|
| + release_callback.Run(is_aborted ? PP_ERROR_ABORTED : PP_OK, 0,
|
| + gpu::SyncToken(), false);
|
| (*it)->ResetReleaseCallback();
|
| }
|
| (*it)->Invalidate();
|
|
|