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

Unified Diff: ui/compositor/layer.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: ui/compositor/layer.cc
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
index 1dc861de0d112e427cf062de079e0ad35831846d..2fb521d71864f86f05eed549b7c196a183949823 100644
--- a/ui/compositor/layer.cc
+++ b/ui/compositor/layer.cc
@@ -553,7 +553,7 @@ void Layer::SetTextureMailbox(
frame_size_in_dip_ = gfx::Size();
}
if (mailbox_release_callback_)
- mailbox_release_callback_->Run(0, false);
+ mailbox_release_callback_->Run(0, gpu::SyncToken(), false);
mailbox_release_callback_ = release_callback.Pass();
mailbox_ = mailbox;
SetTextureSize(texture_size_in_dip);
@@ -623,7 +623,7 @@ void Layer::SetShowSolidColorContent() {
mailbox_ = cc::TextureMailbox();
if (mailbox_release_callback_) {
- mailbox_release_callback_->Run(0, false);
+ mailbox_release_callback_->Run(0, gpu::SyncToken(), false);
mailbox_release_callback_.reset();
}
RecomputeDrawsContentAndUVRect();
« third_party/WebKit/public/platform/WebExternalTextureMailbox.h ('K') | « ui/aura/bench/bench_main.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698