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

Unified Diff: components/test_runner/test_plugin.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: Fix mock gpu video accelerator factory 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
Index: components/test_runner/test_plugin.cc
diff --git a/components/test_runner/test_plugin.cc b/components/test_runner/test_plugin.cc
index 5e2791dff03972216869a8e9c9ffb439ea05e274..5466676eab4f6bc9fb37e004ebd1822848f0e556 100644
--- a/components/test_runner/test_plugin.cc
+++ b/components/test_runner/test_plugin.cc
@@ -314,7 +314,8 @@ void TestPlugin::updateGeometry(
context_->produceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
context_->flush();
uint32 sync_point = context_->insertSyncPoint();
- texture_mailbox_ = cc::TextureMailbox(mailbox, GL_TEXTURE_2D, sync_point);
+ texture_mailbox_ = cc::TextureMailbox(mailbox, GL_TEXTURE_2D, sync_point,
+ gpu::SyncToken());
} else {
scoped_ptr<cc::SharedBitmap> bitmap =
delegate_->GetSharedBitmapManager()->AllocateSharedBitmap(
@@ -341,13 +342,14 @@ bool TestPlugin::isPlaceholder() {
return false;
}
-static void IgnoreReleaseCallback(uint32 sync_point, bool lost) {
-}
+static void IgnoreReleaseCallback(uint32 sync_point,
+ const gpu::SyncToken& sync_token,
+ bool lost) {}
static void ReleaseSharedMemory(scoped_ptr<cc::SharedBitmap> bitmap,
uint32 sync_point,
- bool lost) {
-}
+ const gpu::SyncToken& sync_token,
+ bool lost) {}
bool TestPlugin::PrepareTextureMailbox(
cc::TextureMailbox* mailbox,

Powered by Google App Engine
This is Rietveld 408576698