Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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/layer_tree_host.h" | 5 #include "cc/trees/layer_tree_host.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <stack> | 8 #include <stack> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 281 | 281 |
| 282 LayerTreeImpl* sync_tree = host_impl->sync_tree(); | 282 LayerTreeImpl* sync_tree = host_impl->sync_tree(); |
| 283 | 283 |
| 284 if (next_commit_forces_redraw_) { | 284 if (next_commit_forces_redraw_) { |
| 285 sync_tree->ForceRedrawNextActivation(); | 285 sync_tree->ForceRedrawNextActivation(); |
| 286 next_commit_forces_redraw_ = false; | 286 next_commit_forces_redraw_ = false; |
| 287 } | 287 } |
| 288 | 288 |
| 289 sync_tree->set_source_frame_number(source_frame_number()); | 289 sync_tree->set_source_frame_number(source_frame_number()); |
| 290 | 290 |
| 291 if (needs_full_tree_sync_) | 291 if (needs_full_tree_sync_) { |
| 292 sync_tree->SetRootLayer(TreeSynchronizer::SynchronizeTrees( | 292 sync_tree->SetRootLayer(TreeSynchronizer::SynchronizeTrees( |
| 293 root_layer(), sync_tree->DetachLayerTree(), sync_tree)); | 293 root_layer(), sync_tree->DetachLayerTree(), sync_tree)); |
| 294 } | |
| 294 { | 295 { |
|
enne (OOO)
2014/07/10 18:12:12
Maybe stick a blank line here too? I feel like tha
danakj
2014/07/10 18:13:43
Ok, sure, done. Trying to train myself to whitespa
| |
| 295 TRACE_EVENT0("cc", "LayerTreeHost::PushProperties"); | 296 TRACE_EVENT0("cc", "LayerTreeHost::PushProperties"); |
| 296 TreeSynchronizer::PushProperties(root_layer(), sync_tree->root_layer()); | 297 TreeSynchronizer::PushProperties(root_layer(), sync_tree->root_layer()); |
| 297 } | 298 } |
| 298 | 299 |
| 299 sync_tree->set_needs_full_tree_sync(needs_full_tree_sync_); | 300 sync_tree->set_needs_full_tree_sync(needs_full_tree_sync_); |
| 300 needs_full_tree_sync_ = false; | 301 needs_full_tree_sync_ = false; |
| 301 | 302 |
| 302 if (hud_layer_.get()) { | 303 if (hud_layer_.get()) { |
| 303 LayerImpl* hud_impl = LayerTreeHostCommon::FindLayerInSubtree( | 304 LayerImpl* hud_impl = LayerTreeHostCommon::FindLayerInSubtree( |
| 304 sync_tree->root_layer(), hud_layer_->id()); | 305 sync_tree->root_layer(), hud_layer_->id()); |
| (...skipping 967 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1272 swap_promise_list_.push_back(swap_promise.Pass()); | 1273 swap_promise_list_.push_back(swap_promise.Pass()); |
| 1273 } | 1274 } |
| 1274 | 1275 |
| 1275 void LayerTreeHost::BreakSwapPromises(SwapPromise::DidNotSwapReason reason) { | 1276 void LayerTreeHost::BreakSwapPromises(SwapPromise::DidNotSwapReason reason) { |
| 1276 for (size_t i = 0; i < swap_promise_list_.size(); i++) | 1277 for (size_t i = 0; i < swap_promise_list_.size(); i++) |
| 1277 swap_promise_list_[i]->DidNotSwap(reason); | 1278 swap_promise_list_[i]->DidNotSwap(reason); |
| 1278 swap_promise_list_.clear(); | 1279 swap_promise_list_.clear(); |
| 1279 } | 1280 } |
| 1280 | 1281 |
| 1281 } // namespace cc | 1282 } // namespace cc |
| OLD | NEW |