OLD | NEW |
---|---|
1 // Copyright 2010 The Chromium Authors. All rights reserved. | 1 // Copyright 2010 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/layers/layer.h" | 5 #include "cc/layers/layer.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/location.h" | 10 #include "base/location.h" |
11 #include "base/metrics/histogram.h" | 11 #include "base/metrics/histogram.h" |
12 #include "base/single_thread_task_runner.h" | 12 #include "base/single_thread_task_runner.h" |
13 #include "cc/animation/animation.h" | 13 #include "cc/animation/animation.h" |
14 #include "cc/animation/animation_events.h" | 14 #include "cc/animation/animation_events.h" |
15 #include "cc/animation/layer_animation_controller.h" | 15 #include "cc/animation/layer_animation_controller.h" |
16 #include "cc/layers/layer_client.h" | 16 #include "cc/layers/layer_client.h" |
17 #include "cc/layers/layer_impl.h" | 17 #include "cc/layers/layer_impl.h" |
18 #include "cc/output/copy_output_request.h" | 18 #include "cc/output/copy_output_request.h" |
19 #include "cc/output/copy_output_result.h" | 19 #include "cc/output/copy_output_result.h" |
20 #include "cc/trees/layer_tree_host.h" | 20 #include "cc/trees/layer_tree_host.h" |
21 #include "cc/trees/layer_tree_impl.h" | 21 #include "cc/trees/layer_tree_impl.h" |
22 #include "third_party/skia/include/core/SkImageFilter.h" | 22 #include "third_party/skia/include/core/SkImageFilter.h" |
23 #include "ui/base/layout.h" | |
Ben Goodger (Google)
2013/09/16 23:10:31
why do you need this?
| |
23 #include "ui/gfx/rect_conversions.h" | 24 #include "ui/gfx/rect_conversions.h" |
24 | 25 |
25 namespace cc { | 26 namespace cc { |
26 | 27 |
27 static int s_next_layer_id = 1; | 28 static int s_next_layer_id = 1; |
28 | 29 |
29 scoped_refptr<Layer> Layer::Create() { | 30 scoped_refptr<Layer> Layer::Create() { |
30 return make_scoped_refptr(new Layer()); | 31 return make_scoped_refptr(new Layer()); |
31 } | 32 } |
32 | 33 |
(...skipping 1059 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1092 (*it)->clip_parent_ = NULL; | 1093 (*it)->clip_parent_ = NULL; |
1093 } | 1094 } |
1094 | 1095 |
1095 if (clip_parent_) | 1096 if (clip_parent_) |
1096 clip_parent_->RemoveClipChild(this); | 1097 clip_parent_->RemoveClipChild(this); |
1097 | 1098 |
1098 clip_parent_ = NULL; | 1099 clip_parent_ = NULL; |
1099 } | 1100 } |
1100 | 1101 |
1101 } // namespace cc | 1102 } // namespace cc |
OLD | NEW |