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

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: 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 | « components/pdf_viewer/pdf_viewer.cc ('k') | content/browser/compositor/delegated_frame_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..76f608c96daa08340e0f724e3f554ca9e8526e30 100644
--- a/components/test_runner/test_plugin.cc
+++ b/components/test_runner/test_plugin.cc
@@ -313,8 +313,9 @@ void TestPlugin::updateGeometry(
context_->genMailboxCHROMIUM(mailbox.name);
context_->produceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
context_->flush();
- uint32 sync_point = context_->insertSyncPoint();
- texture_mailbox_ = cc::TextureMailbox(mailbox, GL_TEXTURE_2D, sync_point);
+ gpu::SyncToken sync_token;
+ context_->insertSyncPoint(sync_token.GetData());
+ texture_mailbox_ = cc::TextureMailbox(mailbox, sync_token, GL_TEXTURE_2D);
} else {
scoped_ptr<cc::SharedBitmap> bitmap =
delegate_->GetSharedBitmapManager()->AllocateSharedBitmap(
@@ -341,13 +342,12 @@ bool TestPlugin::isPlaceholder() {
return false;
}
-static void IgnoreReleaseCallback(uint32 sync_point, bool lost) {
+static void IgnoreReleaseCallback(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,
« no previous file with comments | « components/pdf_viewer/pdf_viewer.cc ('k') | content/browser/compositor/delegated_frame_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698