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

Unified Diff: cc/trees/layer_tree_host.cc

Issue 134623005: Make SingleThreadProxy a SchedulerClient (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Synchronous compositeAndReadbackAsync for test reliability Created 6 years, 5 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: cc/trees/layer_tree_host.cc
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
index 48f4864ef4a14e903aba2665fa85a989f725ea8a..a5c71c42ee281dd736838cf91facc5707eb58fbe 100644
--- a/cc/trees/layer_tree_host.cc
+++ b/cc/trees/layer_tree_host.cc
@@ -682,8 +682,12 @@ void LayerTreeHost::NotifyInputThrottledUntilCommit() {
void LayerTreeHost::Composite(base::TimeTicks frame_begin_time) {
DCHECK(!proxy_->HasImplThread());
+ // This function is only valid when not using the scheduler.
+ DCHECK(!settings_.single_thread_proxy_scheduler);
SingleThreadProxy* proxy = static_cast<SingleThreadProxy*>(proxy_.get());
+ SetLayerTreeHostClientReady();
+
if (output_surface_lost_)
proxy->CreateAndInitializeOutputSurface();
if (output_surface_lost_)
@@ -692,6 +696,12 @@ void LayerTreeHost::Composite(base::TimeTicks frame_begin_time) {
proxy->CompositeImmediately(frame_begin_time);
}
+void LayerTreeHost::CompositeNoSwap(base::TimeTicks frame_begin_time) {
+ DCHECK(!proxy_->HasImplThread());
+ SingleThreadProxy* proxy = static_cast<SingleThreadProxy*>(proxy_.get());
+ proxy->CompositeImmediatelyNoSwap(frame_begin_time);
+}
+
bool LayerTreeHost::UpdateLayers(ResourceUpdateQueue* queue) {
DCHECK(!output_surface_lost_);

Powered by Google App Engine
This is Rietveld 408576698