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

Side by Side Diff: ui/compositor/layer.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 | « ui/android/window_android_compositor.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/compositor/layer.h" 5 #include "ui/compositor/layer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/json/json_writer.h" 11 #include "base/json/json_writer.h"
12 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/trace_event/trace_event.h" 15 #include "base/trace_event/trace_event.h"
16 #include "cc/layers/delegated_renderer_layer.h" 16 #include "cc/layers/delegated_renderer_layer.h"
17 #include "cc/layers/layer_settings.h"
17 #include "cc/layers/nine_patch_layer.h" 18 #include "cc/layers/nine_patch_layer.h"
18 #include "cc/layers/picture_layer.h" 19 #include "cc/layers/picture_layer.h"
19 #include "cc/layers/solid_color_layer.h" 20 #include "cc/layers/solid_color_layer.h"
20 #include "cc/layers/surface_layer.h" 21 #include "cc/layers/surface_layer.h"
21 #include "cc/layers/texture_layer.h" 22 #include "cc/layers/texture_layer.h"
22 #include "cc/output/copy_output_request.h" 23 #include "cc/output/copy_output_request.h"
23 #include "cc/output/delegated_frame_data.h" 24 #include "cc/output/delegated_frame_data.h"
24 #include "cc/output/filter_operation.h" 25 #include "cc/output/filter_operation.h"
25 #include "cc/output/filter_operations.h" 26 #include "cc/output/filter_operations.h"
26 #include "cc/playback/display_item_list_settings.h" 27 #include "cc/playback/display_item_list_settings.h"
(...skipping 1046 matching lines...) Expand 10 before | Expand all | Expand 10 after
1073 animator_->RemoveFromCollection(collection); 1074 animator_->RemoveFromCollection(collection);
1074 for (auto* child : children_) 1075 for (auto* child : children_)
1075 child->RemoveAnimatorsInTreeFromCollection(collection); 1076 child->RemoveAnimatorsInTreeFromCollection(collection);
1076 } 1077 }
1077 1078
1078 bool Layer::IsAnimating() const { 1079 bool Layer::IsAnimating() const {
1079 return animator_.get() && animator_->is_animating(); 1080 return animator_.get() && animator_->is_animating();
1080 } 1081 }
1081 1082
1082 } // namespace ui 1083 } // namespace ui
OLDNEW
« no previous file with comments | « ui/android/window_android_compositor.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698