| 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/atomic_sequence_num.h" | 9 #include "base/atomic_sequence_num.h" |
| 10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| 11 #include "base/location.h" | 11 #include "base/location.h" |
| 12 #include "base/metrics/histogram.h" | 12 #include "base/metrics/histogram.h" |
| 13 #include "base/single_thread_task_runner.h" | 13 #include "base/single_thread_task_runner.h" |
| 14 #include "base/time/time.h" | 14 #include "base/time/time.h" |
| 15 #include "cc/animation/animation.h" | 15 #include "cc/animation/animation.h" |
| 16 #include "cc/animation/animation_events.h" | 16 #include "cc/animation/animation_events.h" |
| 17 #include "cc/animation/animation_registrar.h" | 17 #include "cc/animation/animation_registrar.h" |
| 18 #include "cc/animation/keyframed_animation_curve.h" | 18 #include "cc/animation/keyframed_animation_curve.h" |
| 19 #include "cc/animation/layer_animation_controller.h" | 19 #include "cc/animation/layer_animation_controller.h" |
| 20 #include "cc/layers/layer_client.h" | 20 #include "cc/layers/layer_client.h" |
| 21 #include "cc/layers/layer_impl.h" | 21 #include "cc/layers/layer_impl.h" |
| 22 #include "cc/layers/scrollbar_layer_interface.h" | 22 #include "cc/layers/scrollbar_layer_interface.h" |
| 23 #include "cc/output/copy_output_request.h" | 23 #include "cc/output/copy_output_request.h" |
| 24 #include "cc/output/copy_output_result.h" | 24 #include "cc/output/copy_output_result.h" |
| 25 #include "cc/trees/layer_tree_host.h" | 25 #include "cc/trees/layer_tree_host.h" |
| 26 #include "cc/trees/layer_tree_impl.h" | 26 #include "cc/trees/layer_tree_impl.h" |
| 27 #include "cc/trees/main_thread_task_runner.h" |
| 27 #include "third_party/skia/include/core/SkImageFilter.h" | 28 #include "third_party/skia/include/core/SkImageFilter.h" |
| 28 #include "ui/gfx/geometry/vector2d_conversions.h" | 29 #include "ui/gfx/geometry/vector2d_conversions.h" |
| 29 #include "ui/gfx/rect_conversions.h" | 30 #include "ui/gfx/rect_conversions.h" |
| 30 | 31 |
| 31 namespace cc { | 32 namespace cc { |
| 32 | 33 |
| 33 base::StaticAtomicSequenceNumber g_next_layer_id; | 34 base::StaticAtomicSequenceNumber g_next_layer_id; |
| 34 | 35 |
| 35 scoped_refptr<Layer> Layer::Create() { | 36 scoped_refptr<Layer> Layer::Create() { |
| 36 return make_scoped_refptr(new Layer()); | 37 return make_scoped_refptr(new Layer()); |
| (...skipping 1149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1186 if (clip_parent_) | 1187 if (clip_parent_) |
| 1187 clip_parent_->RemoveClipChild(this); | 1188 clip_parent_->RemoveClipChild(this); |
| 1188 | 1189 |
| 1189 clip_parent_ = NULL; | 1190 clip_parent_ = NULL; |
| 1190 } | 1191 } |
| 1191 | 1192 |
| 1192 void Layer::RunMicroBenchmark(MicroBenchmark* benchmark) { | 1193 void Layer::RunMicroBenchmark(MicroBenchmark* benchmark) { |
| 1193 benchmark->RunOnLayer(this); | 1194 benchmark->RunOnLayer(this); |
| 1194 } | 1195 } |
| 1195 } // namespace cc | 1196 } // namespace cc |
| OLD | NEW |