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

Side by Side Diff: cc/trees/proxy_main.cc

Issue 1602343002: compositor-worker: cc->blink mutation plumbing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@compositor-worker-ian-patch
Patch Set: Fix export Created 4 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/trees/proxy_main.h" 5 #include "cc/trees/proxy_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 TRACE_EVENT_INSTANT0("cc", "EarlyOut_OutputSurfaceLost", 177 TRACE_EVENT_INSTANT0("cc", "EarlyOut_OutputSurfaceLost",
178 TRACE_EVENT_SCOPE_THREAD); 178 TRACE_EVENT_SCOPE_THREAD);
179 channel_main_->BeginMainFrameAbortedOnImpl( 179 channel_main_->BeginMainFrameAbortedOnImpl(
180 CommitEarlyOutReason::ABORTED_OUTPUT_SURFACE_LOST, 180 CommitEarlyOutReason::ABORTED_OUTPUT_SURFACE_LOST,
181 begin_main_frame_start_time); 181 begin_main_frame_start_time);
182 return; 182 return;
183 } 183 }
184 184
185 current_pipeline_stage_ = ANIMATE_PIPELINE_STAGE; 185 current_pipeline_stage_ = ANIMATE_PIPELINE_STAGE;
186 186
187 if (begin_main_frame_state->begin_frame_callbacks) {
188 for (auto& callback : *begin_main_frame_state->begin_frame_callbacks)
esprehn 2016/03/31 05:03:11 Why here? Why is this before ApplyScrollAndScale
majidvp 2016/03/31 19:43:03 We want the mutations to get applied before beginn
danakj 2016/04/05 17:45:21 After ApplyScrollAndScale may make sense for now,
189 callback.Run();
190 }
191
187 layer_tree_host_->ApplyScrollAndScale( 192 layer_tree_host_->ApplyScrollAndScale(
188 begin_main_frame_state->scroll_info.get()); 193 begin_main_frame_state->scroll_info.get());
189 194
190 layer_tree_host_->WillBeginMainFrame(); 195 layer_tree_host_->WillBeginMainFrame();
191 196
192 layer_tree_host_->BeginMainFrame(begin_main_frame_state->begin_frame_args); 197 layer_tree_host_->BeginMainFrame(begin_main_frame_state->begin_frame_args);
193 layer_tree_host_->AnimateLayers( 198 layer_tree_host_->AnimateLayers(
194 begin_main_frame_state->begin_frame_args.frame_time); 199 begin_main_frame_state->begin_frame_args.frame_time);
195 200
196 // Recreate all UI resources if there were evicted UI resources when the impl 201 // Recreate all UI resources if there were evicted UI resources when the impl
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 return false; 469 return false;
465 channel_main_->SetNeedsCommitOnImpl(); 470 channel_main_->SetNeedsCommitOnImpl();
466 return true; 471 return true;
467 } 472 }
468 473
469 bool ProxyMain::IsMainThread() const { 474 bool ProxyMain::IsMainThread() const {
470 return task_runner_provider_->IsMainThread(); 475 return task_runner_provider_->IsMainThread();
471 } 476 }
472 477
473 } // namespace cc 478 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698