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

Side by Side Diff: ui/compositor/layer.cc

Issue 714203006: cc: Remove PicturePileBase (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comments Created 6 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
« cc/test/test_picture_pile.h ('K') | « cc/test/test_picture_pile.h ('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/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
11 #include "base/json/json_writer.h" 11 #include "base/json/json_writer.h"
12 #include "base/lazy_instance.h"
danakj 2014/11/12 19:56:38 why is this part of this CL?
hendrikw 2014/11/12 20:25:42 this includes a file that includes a file that inc
12 #include "base/logging.h" 13 #include "base/logging.h"
13 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
14 #include "cc/base/scoped_ptr_algorithm.h" 15 #include "cc/base/scoped_ptr_algorithm.h"
15 #include "cc/layers/content_layer.h" 16 #include "cc/layers/content_layer.h"
16 #include "cc/layers/delegated_renderer_layer.h" 17 #include "cc/layers/delegated_renderer_layer.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"
(...skipping 1025 matching lines...) Expand 10 before | Expand all | Expand 10 after
1047 children_.end(), 1048 children_.end(),
1048 std::bind2nd(std::mem_fun(&Layer::RemoveAnimatorsInTreeFromCollection), 1049 std::bind2nd(std::mem_fun(&Layer::RemoveAnimatorsInTreeFromCollection),
1049 collection)); 1050 collection));
1050 } 1051 }
1051 1052
1052 bool Layer::IsAnimating() const { 1053 bool Layer::IsAnimating() const {
1053 return animator_.get() && animator_->is_animating(); 1054 return animator_.get() && animator_->is_animating();
1054 } 1055 }
1055 1056
1056 } // namespace ui 1057 } // namespace ui
OLDNEW
« cc/test/test_picture_pile.h ('K') | « cc/test/test_picture_pile.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698