third_party/WebKit/Source/platform/graphics/ImageBuffer.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/ImageBuffer.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') | « third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp ('k') | third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.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/ImageBuffer.cpp

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

index 1a67119863ef8e2758d8e1ab5dc4872db450decb..6cc6696420fcabd97fe02815f757ff213980f571 100644

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

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

@@ -216,7 +216,8 @@ bool ImageBuffer::copyToPlatformTexture(WebGraphicsContext3D* context, Platform3

mailbox->syncPoint = sharedContext->insertSyncPoint();

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

+ context->waitSyncPoint(mailbox->syncPoint, mailbox->validSyncToken ? mailbox->syncToken : nullptr);

Platform3DObject sourceTexture = context->createAndConsumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox->name);

// The canvas is stored in a premultiplied format, so unpremultiply if necessary.

@@ -226,7 +227,7 @@ bool ImageBuffer::copyToPlatformTexture(WebGraphicsContext3D* context, Platform3

context->deleteTexture(sourceTexture);

context->flush();

- sharedContext->waitSyncPoint(context->insertSyncPoint());

+ sharedContext->waitSyncPoint(context->insertSyncPoint(), nullptr);

// Undo grContext texture binding changes introduced in this function

provider->grContext()->resetContext(kTextureBinding_GrGLBackendState);