third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp - Issue 1427543002: Modified old wait sync point functions to also accept new sync tokens.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp

Issue 1427543002: Modified old wait sync point functions to also accept new sync tokens. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix mock gpu video accelerator factory Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« ppapi/proxy/ppapi_messages.h ('K') | « ppapi/shared_impl/compositor_layer_data.h ('k') | third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp » ('j') | third_party/WebKit/Source/platform/graphics/gpu/DrawingBufferTest.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp

index 3011d5596be6ebf3489c044d9c7b3a0a26f8013e..5068b6ad247507c1315055b5fa873b47b9483b93 100644

--- a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp

+++ b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp

@@ -522,7 +522,9 @@ void Canvas2DLayerBridge::mailboxReleased(const WebExternalTextureMailbox& mailb

// Invalidate texture state in case the compositor altered it since the copy-on-write.

if (releasedMailboxInfo->m_image) {

if (mailbox.syncPoint) {

- context()->waitSyncPoint(mailbox.syncPoint);

+ context()->waitSyncPoint(mailbox.syncPoint, nullptr);

+ } else if (mailbox.validSyncToken) {

+ context()->waitSyncPoint(0, mailbox.syncToken);

}

GrTexture* texture = releasedMailboxInfo->m_image->getTexture();

if (texture) {