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 "webkit/glue/webkitplatformsupport_impl.h" | 9 #include "webkit/glue/webkitplatformsupport_impl.h" |
10 | 10 |
11 namespace ui { | 11 namespace ui { |
12 | 12 |
13 class CompositorTestPlatformSupport: | 13 class CompositorTestPlatformSupport: |
14 public NON_EXPORTED_BASE(webkit_glue::WebKitPlatformSupportImpl) { | 14 public NON_EXPORTED_BASE(webkit_glue::WebKitPlatformSupportImpl) { |
15 public: | 15 public: |
16 virtual string16 GetLocalizedString(int message_id) OVERRIDE { | 16 virtual string16 GetLocalizedString(int message_id) OVERRIDE { |
17 return string16(); | 17 return string16(); |
18 } | 18 } |
19 | 19 |
20 virtual base::StringPiece GetDataResource(int resource_id) OVERRIDE { | 20 virtual base::StringPiece GetDataResource( |
| 21 int resource_id, |
| 22 ui::ScaleFactor scale_factor) OVERRIDE { |
21 return base::StringPiece(); | 23 return base::StringPiece(); |
22 } | 24 } |
23 | 25 |
24 virtual base::StringPiece GetImageResource(int resource_id, | |
25 float scale_factor) OVERRIDE { | |
26 return base::StringPiece(); | |
27 } | |
28 | |
29 virtual void GetPlugins( | 26 virtual void GetPlugins( |
30 bool refresh, std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE { | 27 bool refresh, std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE { |
31 } | 28 } |
32 | 29 |
33 virtual webkit_glue::ResourceLoaderBridge* CreateResourceLoader( | 30 virtual webkit_glue::ResourceLoaderBridge* CreateResourceLoader( |
34 const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) | 31 const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) |
35 OVERRIDE { | 32 OVERRIDE { |
36 NOTREACHED(); | 33 NOTREACHED(); |
37 return NULL; | 34 return NULL; |
38 } | 35 } |
(...skipping 15 matching lines...) Expand all Loading... |
54 } | 51 } |
55 | 52 |
56 void CompositorTestSupport::Terminate() { | 53 void CompositorTestSupport::Terminate() { |
57 DCHECK(g_webkit_support); | 54 DCHECK(g_webkit_support); |
58 WebKit::shutdown(); | 55 WebKit::shutdown(); |
59 delete g_webkit_support; | 56 delete g_webkit_support; |
60 g_webkit_support = NULL; | 57 g_webkit_support = NULL; |
61 } | 58 } |
62 | 59 |
63 } // namespace ui | 60 } // namespace ui |
OLD | NEW |