cc/test/layer_tree_pixel_test.cc - 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: cc/test/layer_tree_pixel_test.cc

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: format Created 5 years, 1 month 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

Index: cc/test/layer_tree_pixel_test.cc

diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc

index a08211b0804ae9523be53d6e79c065c26b64b5fb..b4fafd25ead79c118525cae46827247fb15bfc40 100644

--- a/cc/test/layer_tree_pixel_test.cc

+++ b/cc/test/layer_tree_pixel_test.cc

@@ -228,8 +228,8 @@ scoped_ptr<SkBitmap> LayerTreePixelTest::CopyTextureMailboxToBitmap(

scoped_ptr<gpu::GLInProcessContext> context = CreateTestInProcessContext();

GLES2Interface* gl = context->GetImplementation();

- if (texture_mailbox.sync_point())

- gl->WaitSyncPointCHROMIUM(texture_mailbox.sync_point());

+ if (texture_mailbox.sync_token().HasData())

+ gl->WaitSyncTokenCHROMIUM(texture_mailbox.sync_token().GetConstData());

GLuint texture_id = 0;

gl->GenTextures(1, &texture_id);

« no previous file with comments | « cc/surfaces/surface_aggregator.cc ('k') | cc/test/render_pass_test_utils.h » ('j') | no next file with comments »