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

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

Issue 1462613002: Move cc::LayerSettings to cc/layers/layer_settings.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cc_perftests Created 5 years, 1 month 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
« no previous file with comments | « cc/test/layer_tree_test.h ('k') | cc/trees/layer_tree_settings.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 #include <stack> 8 #include <stack>
9 #include <string> 9 #include <string>
10 10
(...skipping 15 matching lines...) Expand all
26 #include "cc/base/math_util.h" 26 #include "cc/base/math_util.h"
27 #include "cc/debug/devtools_instrumentation.h" 27 #include "cc/debug/devtools_instrumentation.h"
28 #include "cc/debug/frame_viewer_instrumentation.h" 28 #include "cc/debug/frame_viewer_instrumentation.h"
29 #include "cc/debug/rendering_stats_instrumentation.h" 29 #include "cc/debug/rendering_stats_instrumentation.h"
30 #include "cc/input/layer_selection_bound.h" 30 #include "cc/input/layer_selection_bound.h"
31 #include "cc/input/page_scale_animation.h" 31 #include "cc/input/page_scale_animation.h"
32 #include "cc/layers/heads_up_display_layer.h" 32 #include "cc/layers/heads_up_display_layer.h"
33 #include "cc/layers/heads_up_display_layer_impl.h" 33 #include "cc/layers/heads_up_display_layer_impl.h"
34 #include "cc/layers/layer.h" 34 #include "cc/layers/layer.h"
35 #include "cc/layers/layer_iterator.h" 35 #include "cc/layers/layer_iterator.h"
36 #include "cc/layers/layer_settings.h"
36 #include "cc/layers/painted_scrollbar_layer.h" 37 #include "cc/layers/painted_scrollbar_layer.h"
37 #include "cc/resources/ui_resource_request.h" 38 #include "cc/resources/ui_resource_request.h"
38 #include "cc/scheduler/begin_frame_source.h" 39 #include "cc/scheduler/begin_frame_source.h"
39 #include "cc/trees/draw_property_utils.h" 40 #include "cc/trees/draw_property_utils.h"
40 #include "cc/trees/layer_tree_host_client.h" 41 #include "cc/trees/layer_tree_host_client.h"
41 #include "cc/trees/layer_tree_host_common.h" 42 #include "cc/trees/layer_tree_host_common.h"
42 #include "cc/trees/layer_tree_host_impl.h" 43 #include "cc/trees/layer_tree_host_impl.h"
43 #include "cc/trees/layer_tree_impl.h" 44 #include "cc/trees/layer_tree_impl.h"
44 #include "cc/trees/single_thread_proxy.h" 45 #include "cc/trees/single_thread_proxy.h"
45 #include "cc/trees/thread_proxy.h" 46 #include "cc/trees/thread_proxy.h"
(...skipping 1198 matching lines...) Expand 10 before | Expand all | Expand 10 after
1244 return animation_host_ ? animation_host_->HasAnyAnimation(layer->id()) 1245 return animation_host_ ? animation_host_->HasAnyAnimation(layer->id())
1245 : false; 1246 : false;
1246 } 1247 }
1247 1248
1248 bool LayerTreeHost::HasActiveAnimation(const Layer* layer) const { 1249 bool LayerTreeHost::HasActiveAnimation(const Layer* layer) const {
1249 return animation_host_ ? animation_host_->HasActiveAnimation(layer->id()) 1250 return animation_host_ ? animation_host_->HasActiveAnimation(layer->id())
1250 : false; 1251 : false;
1251 } 1252 }
1252 1253
1253 } // namespace cc 1254 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/layer_tree_test.h ('k') | cc/trees/layer_tree_settings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698