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

Unified Diff: cc/trees/layer_tree_host_perftest.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: rebase + autogen 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/trees/layer_tree_host_perftest.cc
diff --git a/cc/trees/layer_tree_host_perftest.cc b/cc/trees/layer_tree_host_perftest.cc
index 845b1305e59a86be0bc4d7488fbb0736eddc44f5..b8f86d79f311f75acb6abd64d632f847b711575b 100644
--- a/cc/trees/layer_tree_host_perftest.cc
+++ b/cc/trees/layer_tree_host_perftest.cc
@@ -260,7 +260,8 @@ TEST_F(ScrollingLayerTreePerfTest, LongScrollablePageThreaded) {
set_verify_property_trees(old_verify_property_trees);
}
-static void EmptyReleaseCallback(uint32 sync_point, bool lost_resource) {}
+static void EmptyReleaseCallback(const gpu::SyncToken& sync_token,
+ bool lost_resource) {}
// Simulates main-thread scrolling on each frame.
class BrowserCompositorInvalidateLayerTreePerfTest
@@ -292,7 +293,8 @@ class BrowserCompositorInvalidateLayerTreePerfTest
reinterpret_cast<const int8*>(name_stream.str().c_str()));
scoped_ptr<SingleReleaseCallback> callback = SingleReleaseCallback::Create(
base::Bind(&EmptyReleaseCallback));
- TextureMailbox mailbox(gpu_mailbox, GL_TEXTURE_2D, next_sync_point_);
+ TextureMailbox mailbox(gpu_mailbox, gpu::SyncToken(next_sync_point_),
+ GL_TEXTURE_2D);
next_sync_point_++;
tab_contents_->SetTextureMailbox(mailbox, callback.Pass());

Powered by Google App Engine
This is Rietveld 408576698