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

Unified Diff: cc/layers/texture_layer_impl_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 | « cc/layers/texture_layer_impl.cc ('k') | cc/layers/texture_layer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/texture_layer_impl_unittest.cc
diff --git a/cc/layers/texture_layer_impl_unittest.cc b/cc/layers/texture_layer_impl_unittest.cc
index 27efd971502dc2a2012ae7955392532d052cf4d7..fe2e006f174c8cf2211b0f430c50a988f30dd0ad 100644
--- a/cc/layers/texture_layer_impl_unittest.cc
+++ b/cc/layers/texture_layer_impl_unittest.cc
@@ -12,10 +12,9 @@
namespace cc {
namespace {
-void IgnoreCallback(uint32 sync_point,
+void IgnoreCallback(const gpu::SyncToken& sync_token,
bool lost,
- BlockingTaskRunner* main_thread_task_runner) {
-}
+ BlockingTaskRunner* main_thread_task_runner) {}
TEST(TextureLayerImplTest, VisibleOpaqueRegion) {
const gfx::Size layer_bounds(100, 100);
@@ -52,7 +51,7 @@ TEST(TextureLayerImplTest, Occlusion) {
gpu::Mailbox mailbox;
impl.output_surface()->context_provider()->ContextGL()->GenMailboxCHROMIUM(
mailbox.name);
- TextureMailbox texture_mailbox(mailbox, GL_TEXTURE_2D, 0);
+ TextureMailbox texture_mailbox(mailbox, gpu::SyncToken(), GL_TEXTURE_2D);
TextureLayerImpl* texture_layer_impl =
impl.AddChildToRoot<TextureLayerImpl>();
« no previous file with comments | « cc/layers/texture_layer_impl.cc ('k') | cc/layers/texture_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698