Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

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: 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
« no previous file with comments | « content/common/gpu/client/gl_helper.cc ('k') | content/common/gpu/client/gpu_context_tests.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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..e53829318c5da4dd1262f8510d612055ccab4386 100644
--- a/content/common/gpu/client/gl_helper_unittest.cc
+++ b/content/common/gpu/client/gl_helper_unittest.cc
@@ -1363,7 +1363,8 @@ 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;
+ ASSERT_TRUE(context_->insertSyncPoint(sync_token.GetData()));
std::string message = base::StringPrintf(
"input size: %dx%d "
@@ -1407,9 +1408,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();
« no previous file with comments | « content/common/gpu/client/gl_helper.cc ('k') | content/common/gpu/client/gpu_context_tests.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698