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

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

Issue 13285002: cc: Consolidate LayerList types. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « cc/trees/layer_tree_host.h ('k') | cc/trees/layer_tree_host_common.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/debug/trace_event.h" 11 #include "base/debug/trace_event.h"
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "base/stl_util.h" 13 #include "base/stl_util.h"
14 #include "base/string_number_conversions.h" 14 #include "base/string_number_conversions.h"
15 #include "cc/animation/animation_registrar.h" 15 #include "cc/animation/animation_registrar.h"
16 #include "cc/animation/layer_animation_controller.h" 16 #include "cc/animation/layer_animation_controller.h"
17 #include "cc/base/math_util.h" 17 #include "cc/base/math_util.h"
18 #include "cc/base/thread.h" 18 #include "cc/base/thread.h"
19 #include "cc/debug/overdraw_metrics.h" 19 #include "cc/debug/overdraw_metrics.h"
20 #include "cc/debug/rendering_stats_instrumentation.h" 20 #include "cc/debug/rendering_stats_instrumentation.h"
21 #include "cc/input/pinch_zoom_scrollbar.h" 21 #include "cc/input/pinch_zoom_scrollbar.h"
22 #include "cc/input/pinch_zoom_scrollbar_geometry.h" 22 #include "cc/input/pinch_zoom_scrollbar_geometry.h"
23 #include "cc/input/pinch_zoom_scrollbar_painter.h" 23 #include "cc/input/pinch_zoom_scrollbar_painter.h"
24 #include "cc/input/top_controls_manager.h" 24 #include "cc/input/top_controls_manager.h"
25 #include "cc/layers/heads_up_display_layer.h" 25 #include "cc/layers/heads_up_display_layer.h"
26 #include "cc/layers/heads_up_display_layer_impl.h" 26 #include "cc/layers/heads_up_display_layer_impl.h"
27 #include "cc/layers/layer.h" 27 #include "cc/layers/layer.h"
28 #include "cc/layers/layer_iterator.h" 28 #include "cc/layers/layer_iterator.h"
29 #include "cc/layers/render_surface.h"
29 #include "cc/layers/scrollbar_layer.h" 30 #include "cc/layers/scrollbar_layer.h"
30 #include "cc/resources/prioritized_resource_manager.h" 31 #include "cc/resources/prioritized_resource_manager.h"
31 #include "cc/trees/layer_tree_host_client.h" 32 #include "cc/trees/layer_tree_host_client.h"
32 #include "cc/trees/layer_tree_host_common.h" 33 #include "cc/trees/layer_tree_host_common.h"
33 #include "cc/trees/layer_tree_host_impl.h" 34 #include "cc/trees/layer_tree_host_impl.h"
34 #include "cc/trees/layer_tree_impl.h" 35 #include "cc/trees/layer_tree_impl.h"
35 #include "cc/trees/occlusion_tracker.h" 36 #include "cc/trees/occlusion_tracker.h"
36 #include "cc/trees/single_thread_proxy.h" 37 #include "cc/trees/single_thread_proxy.h"
37 #include "cc/trees/thread_proxy.h" 38 #include "cc/trees/thread_proxy.h"
38 #include "cc/trees/tree_synchronizer.h" 39 #include "cc/trees/tree_synchronizer.h"
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after
712 } 713 }
713 714
714 const Layer* LayerTreeHost::RootScrollLayer() const { 715 const Layer* LayerTreeHost::RootScrollLayer() const {
715 return FindFirstScrollableLayer(root_layer_.get()); 716 return FindFirstScrollableLayer(root_layer_.get());
716 } 717 }
717 718
718 void LayerTreeHost::UpdateLayers(Layer* root_layer, 719 void LayerTreeHost::UpdateLayers(Layer* root_layer,
719 ResourceUpdateQueue* queue) { 720 ResourceUpdateQueue* queue) {
720 TRACE_EVENT0("cc", "LayerTreeHost::UpdateLayers"); 721 TRACE_EVENT0("cc", "LayerTreeHost::UpdateLayers");
721 722
722 LayerList update_list; { 723 LayerList update_list;
724 {
723 Layer* root_scroll = FindFirstScrollableLayer(root_layer); 725 Layer* root_scroll = FindFirstScrollableLayer(root_layer);
724 if (root_scroll) 726 if (root_scroll)
725 root_scroll->SetImplTransform(impl_transform_); 727 root_scroll->SetImplTransform(impl_transform_);
726 728
727 UpdateHudLayer(); 729 UpdateHudLayer();
728 730
729 TRACE_EVENT0("cc", "LayerTreeHost::UpdateLayers::CalcDrawProps"); 731 TRACE_EVENT0("cc", "LayerTreeHost::UpdateLayers::CalcDrawProps");
730 LayerTreeHostCommon::CalculateDrawProperties( 732 LayerTreeHostCommon::CalculateDrawProperties(
731 root_layer, 733 root_layer,
732 device_viewport_size(), 734 device_viewport_size(),
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
1077 SetAnimationEventsRecursive(events, 1079 SetAnimationEventsRecursive(events,
1078 layer->children()[child_index].get(), 1080 layer->children()[child_index].get(),
1079 wall_clock_time); 1081 wall_clock_time);
1080 } 1082 }
1081 1083
1082 skia::RefPtr<SkPicture> LayerTreeHost::CapturePicture() { 1084 skia::RefPtr<SkPicture> LayerTreeHost::CapturePicture() {
1083 return proxy_->CapturePicture(); 1085 return proxy_->CapturePicture();
1084 } 1086 }
1085 1087
1086 } // namespace cc 1088 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host.h ('k') | cc/trees/layer_tree_host_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698