| OLD | NEW |
| 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 "cc/layers/layer_settings.h" |
| 5 #include "ui/compositor/layer.h" | 6 #include "ui/compositor/layer.h" |
| 6 #include "ui/compositor/test/test_layer_animation_delegate.h" | 7 #include "ui/compositor/test/test_layer_animation_delegate.h" |
| 7 | 8 |
| 8 namespace ui { | 9 namespace ui { |
| 9 | 10 |
| 10 TestLayerThreadedAnimationDelegate::TestLayerThreadedAnimationDelegate() {} | 11 TestLayerThreadedAnimationDelegate::TestLayerThreadedAnimationDelegate() {} |
| 11 | 12 |
| 12 TestLayerThreadedAnimationDelegate::~TestLayerThreadedAnimationDelegate() {} | 13 TestLayerThreadedAnimationDelegate::~TestLayerThreadedAnimationDelegate() {} |
| 13 | 14 |
| 14 TestLayerAnimationDelegate::TestLayerAnimationDelegate() | 15 TestLayerAnimationDelegate::TestLayerAnimationDelegate() |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 cc::Layer* TestLayerAnimationDelegate::GetCcLayer() const { | 110 cc::Layer* TestLayerAnimationDelegate::GetCcLayer() const { |
| 110 return cc_layer_.get(); | 111 return cc_layer_.get(); |
| 111 } | 112 } |
| 112 | 113 |
| 113 LayerThreadedAnimationDelegate* | 114 LayerThreadedAnimationDelegate* |
| 114 TestLayerAnimationDelegate::GetThreadedAnimationDelegate() { | 115 TestLayerAnimationDelegate::GetThreadedAnimationDelegate() { |
| 115 return &threaded_delegate_; | 116 return &threaded_delegate_; |
| 116 } | 117 } |
| 117 | 118 |
| 118 void TestLayerAnimationDelegate::CreateCcLayer() { | 119 void TestLayerAnimationDelegate::CreateCcLayer() { |
| 119 cc_layer_ = cc::Layer::Create(ui::Layer::UILayerSettings()); | 120 cc_layer_ = cc::Layer::Create(cc::LayerSettings()); |
| 120 } | 121 } |
| 121 | 122 |
| 122 void TestLayerThreadedAnimationDelegate::AddThreadedAnimation( | 123 void TestLayerThreadedAnimationDelegate::AddThreadedAnimation( |
| 123 scoped_ptr<cc::Animation> animation) {} | 124 scoped_ptr<cc::Animation> animation) {} |
| 124 | 125 |
| 125 void TestLayerThreadedAnimationDelegate::RemoveThreadedAnimation( | 126 void TestLayerThreadedAnimationDelegate::RemoveThreadedAnimation( |
| 126 int animation_id) {} | 127 int animation_id) {} |
| 127 | 128 |
| 128 } // namespace ui | 129 } // namespace ui |
| OLD | NEW |