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

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 blimp issue Created 4 years, 11 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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 CommitEarlyOutReason::ABORTED_OUTPUT_SURFACE_LOST, 168 CommitEarlyOutReason::ABORTED_OUTPUT_SURFACE_LOST,
169 begin_main_frame_start_time); 169 begin_main_frame_start_time);
170 return; 170 return;
171 } 171 }
172 172
173 current_pipeline_stage_ = ANIMATE_PIPELINE_STAGE; 173 current_pipeline_stage_ = ANIMATE_PIPELINE_STAGE;
174 174
175 layer_tree_host_->ApplyScrollAndScale( 175 layer_tree_host_->ApplyScrollAndScale(
176 begin_main_frame_state->scroll_info.get()); 176 begin_main_frame_state->scroll_info.get());
177 177
178 layer_tree_host_->ApplyMutations(begin_main_frame_state->mutations.get());
179
178 layer_tree_host_->WillBeginMainFrame(); 180 layer_tree_host_->WillBeginMainFrame();
179 181
180 layer_tree_host_->BeginMainFrame(begin_main_frame_state->begin_frame_args); 182 layer_tree_host_->BeginMainFrame(begin_main_frame_state->begin_frame_args);
181 layer_tree_host_->AnimateLayers( 183 layer_tree_host_->AnimateLayers(
182 begin_main_frame_state->begin_frame_args.frame_time); 184 begin_main_frame_state->begin_frame_args.frame_time);
183 185
184 // Recreate all UI resources if there were evicted UI resources when the impl 186 // Recreate all UI resources if there were evicted UI resources when the impl
185 // thread initiated the commit. 187 // thread initiated the commit.
186 if (begin_main_frame_state->evicted_ui_resources) 188 if (begin_main_frame_state->evicted_ui_resources)
187 layer_tree_host_->RecreateUIResources(); 189 layer_tree_host_->RecreateUIResources();
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 return false; 456 return false;
455 channel_main_->SetNeedsCommitOnImpl(); 457 channel_main_->SetNeedsCommitOnImpl();
456 return true; 458 return true;
457 } 459 }
458 460
459 bool ProxyMain::IsMainThread() const { 461 bool ProxyMain::IsMainThread() const {
460 return task_runner_provider_->IsMainThread(); 462 return task_runner_provider_->IsMainThread();
461 } 463 }
462 464
463 } // namespace cc 465 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698