content/common/gpu/client/gl_helper_unittest.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: content/common/gpu/client/gl_helper_unittest.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: Folded sync_point into sync_tokens 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

« cc/output/gl_renderer_unittest.cc ('K') | « content/common/gpu/client/gl_helper.cc ('k') | content/common/media/video_capture_messages.h » ('j') | gpu/command_buffer/client/gles2_implementation.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/client/gl_helper_unittest.cc

diff --git a/content/common/gpu/client/gl_helper_unittest.cc b/content/common/gpu/client/gl_helper_unittest.cc

index 8278d76c8dd4e70c3fcc7dba778b245399922d35..ce7750bf005cabdf7ca57533ff2f45c6245a1a78 100644

--- a/content/common/gpu/client/gl_helper_unittest.cc

+++ b/content/common/gpu/client/gl_helper_unittest.cc

@@ -1363,7 +1363,7 @@ class GLHelperTest : public testing::Test {

context_->genMailboxCHROMIUM(mailbox.name);

EXPECT_FALSE(mailbox.IsZero());

context_->produceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);

- uint32 sync_point = context_->insertSyncPoint();

+ gpu::SyncToken sync_token(context_->insertSyncPoint());

std::string message = base::StringPrintf(

"input size: %dx%d "

@@ -1407,9 +1407,7 @@ class GLHelperTest : public testing::Test {

base::TimeDelta::FromSeconds(0));

base::RunLoop run_loop;

- yuv_reader->ReadbackYUV(mailbox,

- sync_point,

- output_frame.get(),

+ yuv_reader->ReadbackYUV(mailbox, sync_token, output_frame.get(),

gfx::Point(xmargin, ymargin),

base::Bind(&callcallback, run_loop.QuitClosure()));

run_loop.Run();