| Index: cc/resources/video_resource_updater.cc
|
| diff --git a/cc/resources/video_resource_updater.cc b/cc/resources/video_resource_updater.cc
|
| index 3ef6e76c98caff89d8efff04342e9ba083bc7c60..fd3221258de64ece6c64980a144eb95a29f424db 100644
|
| --- a/cc/resources/video_resource_updater.cc
|
| +++ b/cc/resources/video_resource_updater.cc
|
| @@ -75,14 +75,13 @@
|
| const gpu::SyncToken& sync_token)
|
| : gl_(gl), sync_token_(sync_token) {}
|
| ~SyncTokenClientImpl() override {}
|
| - void GenerateSyncToken(gpu::SyncToken* sync_token) override {
|
| + uint32 InsertSyncPoint() override {
|
| if (sync_token_.HasData()) {
|
| - *sync_token = sync_token_;
|
| - } else {
|
| - const uint64_t fence_sync = gl_->InsertFenceSyncCHROMIUM();
|
| - gl_->ShallowFlushCHROMIUM();
|
| - gl_->GenSyncTokenCHROMIUM(fence_sync, sync_token->GetData());
|
| - }
|
| + DCHECK_EQ(gpu::CommandBufferNamespace::OLD_SYNC_POINTS,
|
| + sync_token_.namespace_id());
|
| + return static_cast<uint32>(sync_token_.release_count());
|
| + }
|
| + return gl_->InsertSyncPointCHROMIUM();
|
| }
|
| void WaitSyncToken(const gpu::SyncToken& sync_token) override {
|
| if (sync_token.HasData()) {
|
|
|