Commit 3caef7b9 authored by Justin Novosad's avatar Justin Novosad Committed by Commit Bot

Add missing synchronization in 2d canvas resource release

Call to WaitSyncTokenCHROMIUM was removed by mistake in:
https://chromium-review.googlesource.com/c/chromium/src/+/579690

BUG=769155, 766611

Change-Id: I25a95c79755801463b15fb12047458c594bf24d6
Reviewed-on: https://chromium-review.googlesource.com/685379
Commit-Queue: Xida Chen <xidachen@chromium.org>
Commit-Queue: Justin Novosad <junov@chromium.org>
Reviewed-by: default avatarXida Chen <xidachen@chromium.org>
Reviewed-by: default avatarOlivia Lai <xlai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504748}
parent 028cb2fd
...@@ -1027,6 +1027,11 @@ void Canvas2DLayerBridge::ReleaseFrameResources( ...@@ -1027,6 +1027,11 @@ void Canvas2DLayerBridge::ReleaseFrameResources(
const gpu::Mailbox& mailbox, const gpu::Mailbox& mailbox,
const gpu::SyncToken& sync_token, const gpu::SyncToken& sync_token,
bool lost_resource) { bool lost_resource) {
if (sync_token.HasData() && context_provider_wrapper) {
context_provider_wrapper->ContextProvider()
->ContextGL()
->WaitSyncTokenCHROMIUM(sync_token.GetConstData());
}
bool context_or_layer_bridge_lost = true; bool context_or_layer_bridge_lost = true;
if (layer_bridge) { if (layer_bridge) {
DCHECK(layer_bridge->IsAccelerated() || layer_bridge->IsHibernating()); DCHECK(layer_bridge->IsAccelerated() || layer_bridge->IsHibernating());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment