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/layer_tree_host.h" | 5 #include "cc/layer_tree_host.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 274 syncTree = hostImpl->activeTree(); | 274 syncTree = hostImpl->activeTree(); |
| 275 needsFullTreeSync = m_needsFullTreeSync; | 275 needsFullTreeSync = m_needsFullTreeSync; |
| 276 } | 276 } |
| 277 | 277 |
| 278 if (needsFullTreeSync) | 278 if (needsFullTreeSync) |
| 279 syncTree->SetRootLayer(TreeSynchronizer::synchronizeTrees(rootLayer(), s yncTree->DetachLayerTree(), syncTree)); | 279 syncTree->SetRootLayer(TreeSynchronizer::synchronizeTrees(rootLayer(), s yncTree->DetachLayerTree(), syncTree)); |
| 280 { | 280 { |
| 281 TRACE_EVENT0("cc", "LayerTreeHost::pushProperties"); | 281 TRACE_EVENT0("cc", "LayerTreeHost::pushProperties"); |
| 282 TreeSynchronizer::pushProperties(rootLayer(), syncTree->RootLayer()); | 282 TreeSynchronizer::pushProperties(rootLayer(), syncTree->RootLayer()); |
| 283 } | 283 } |
| 284 syncTree->FindRootScrollLayer(); | |
|
enne (OOO)
2013/01/18 21:57:01
Ooh, this is nice to see.
| |
| 285 | 284 |
| 286 m_needsFullTreeSync = false; | 285 m_needsFullTreeSync = false; |
| 287 | 286 |
| 288 if (m_rootLayer && m_hudLayer) | 287 if (m_rootLayer && m_hudLayer) |
| 289 syncTree->set_hud_layer(static_cast<HeadsUpDisplayLayerImpl*>(LayerTreeH ostCommon::findLayerInSubtree(syncTree->RootLayer(), m_hudLayer->id()))); | 288 syncTree->set_hud_layer(static_cast<HeadsUpDisplayLayerImpl*>(LayerTreeH ostCommon::findLayerInSubtree(syncTree->RootLayer(), m_hudLayer->id()))); |
| 290 else | 289 else |
| 291 syncTree->set_hud_layer(0); | 290 syncTree->set_hud_layer(0); |
| 292 | 291 |
| 293 syncTree->set_source_frame_number(commitNumber()); | 292 syncTree->set_source_frame_number(commitNumber()); |
| 294 syncTree->set_background_color(m_backgroundColor); | 293 syncTree->set_background_color(m_backgroundColor); |
| (...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 867 for (size_t childIndex = 0; childIndex < layer->children().size(); ++childIn dex) | 866 for (size_t childIndex = 0; childIndex < layer->children().size(); ++childIn dex) |
| 868 setAnimationEventsRecursive(events, layer->children()[childIndex].get(), wallClockTime); | 867 setAnimationEventsRecursive(events, layer->children()[childIndex].get(), wallClockTime); |
| 869 } | 868 } |
| 870 | 869 |
| 871 skia::RefPtr<SkPicture> LayerTreeHost::capturePicture() | 870 skia::RefPtr<SkPicture> LayerTreeHost::capturePicture() |
| 872 { | 871 { |
| 873 return m_proxy->capturePicture(); | 872 return m_proxy->capturePicture(); |
| 874 } | 873 } |
| 875 | 874 |
| 876 } // namespace cc | 875 } // namespace cc |
| OLD | NEW |