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 "ui/compositor/test/compositor_test_support.h" | 5 #include "ui/compositor/test/compositor_test_support.h" |
6 | 6 |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" | 8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" |
| 9 #include "ui/compositor/layer_animator.h" |
9 #include "webkit/glue/webkitplatformsupport_impl.h" | 10 #include "webkit/glue/webkitplatformsupport_impl.h" |
10 | 11 |
11 namespace ui { | 12 namespace ui { |
12 | 13 |
| 14 namespace test { |
| 15 |
| 16 // static |
| 17 scoped_ptr<AnimationContainerTestHelper> CreateLayerAnimatorHelperForTest() { |
| 18 LayerAnimator::set_disable_animations_for_test(false); |
| 19 |
| 20 scoped_ptr<AnimationContainerTestHelper> result; |
| 21 result.reset( |
| 22 new AnimationContainerTestHelper( |
| 23 internal::GetLayerAnimationContainer())); |
| 24 return result.Pass(); |
| 25 } |
| 26 |
| 27 } // namespace test |
| 28 |
13 class CompositorTestPlatformSupport: | 29 class CompositorTestPlatformSupport: |
14 public NON_EXPORTED_BASE(webkit_glue::WebKitPlatformSupportImpl) { | 30 public NON_EXPORTED_BASE(webkit_glue::WebKitPlatformSupportImpl) { |
15 public: | 31 public: |
16 virtual string16 GetLocalizedString(int message_id) OVERRIDE { | 32 virtual string16 GetLocalizedString(int message_id) OVERRIDE { |
17 return string16(); | 33 return string16(); |
18 } | 34 } |
19 | 35 |
20 virtual base::StringPiece GetDataResource( | 36 virtual base::StringPiece GetDataResource( |
21 int resource_id, | 37 int resource_id, |
22 ui::ScaleFactor scale_factor) OVERRIDE { | 38 ui::ScaleFactor scale_factor) OVERRIDE { |
(...skipping 28 matching lines...) Expand all Loading... |
51 } | 67 } |
52 | 68 |
53 void CompositorTestSupport::Terminate() { | 69 void CompositorTestSupport::Terminate() { |
54 DCHECK(g_webkit_support); | 70 DCHECK(g_webkit_support); |
55 WebKit::shutdown(); | 71 WebKit::shutdown(); |
56 delete g_webkit_support; | 72 delete g_webkit_support; |
57 g_webkit_support = NULL; | 73 g_webkit_support = NULL; |
58 } | 74 } |
59 | 75 |
60 } // namespace ui | 76 } // namespace ui |
OLD | NEW |