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 "webkit/tools/test_shell/test_shell_webkit_init.h" | 5 #include "webkit/tools/test_shell/test_shell_webkit_init.h" |
6 | 6 |
7 #include "base/metrics/stats_counters.h" | 7 #include "base/metrics/stats_counters.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "media/base/media.h" | 9 #include "media/base/media.h" |
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" | 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" |
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
259 return dom_storage_system_.CreateLocalStorageNamespace(); | 259 return dom_storage_system_.CreateLocalStorageNamespace(); |
260 } | 260 } |
261 | 261 |
262 WebKit::WebIDBFactory* TestShellWebKitInit::idbFactory() { | 262 WebKit::WebIDBFactory* TestShellWebKitInit::idbFactory() { |
263 return WebKit::WebIDBFactory::create(); | 263 return WebKit::WebIDBFactory::create(); |
264 } | 264 } |
265 | 265 |
266 WebKit::WebGraphicsContext3D* | 266 WebKit::WebGraphicsContext3D* |
267 TestShellWebKitInit::createOffscreenGraphicsContext3D( | 267 TestShellWebKitInit::createOffscreenGraphicsContext3D( |
268 const WebKit::WebGraphicsContext3D::Attributes& attributes) { | 268 const WebKit::WebGraphicsContext3D::Attributes& attributes) { |
269 return new webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl( | 269 using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl; |
| 270 return WebGraphicsContext3DInProcessCommandBufferImpl::CreateOffscreenContext( |
270 attributes); | 271 attributes); |
271 } | 272 } |
272 | 273 |
273 void TestShellWebKitInit::GetPlugins( | 274 void TestShellWebKitInit::GetPlugins( |
274 bool refresh, std::vector<webkit::WebPluginInfo>* plugins) { | 275 bool refresh, std::vector<webkit::WebPluginInfo>* plugins) { |
275 if (refresh) | 276 if (refresh) |
276 webkit::npapi::PluginList::Singleton()->RefreshPlugins(); | 277 webkit::npapi::PluginList::Singleton()->RefreshPlugins(); |
277 webkit::npapi::PluginList::Singleton()->GetPlugins(plugins); | 278 webkit::npapi::PluginList::Singleton()->GetPlugins(plugins); |
278 } | 279 } |
279 | 280 |
280 webkit_glue::ResourceLoaderBridge* | 281 webkit_glue::ResourceLoaderBridge* |
281 TestShellWebKitInit::CreateResourceLoader( | 282 TestShellWebKitInit::CreateResourceLoader( |
282 const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) { | 283 const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) { |
283 return SimpleResourceLoaderBridge::Create(request_info); | 284 return SimpleResourceLoaderBridge::Create(request_info); |
284 } | 285 } |
285 | 286 |
286 webkit_glue::WebSocketStreamHandleBridge* | 287 webkit_glue::WebSocketStreamHandleBridge* |
287 TestShellWebKitInit::CreateWebSocketBridge( | 288 TestShellWebKitInit::CreateWebSocketBridge( |
288 WebKit::WebSocketStreamHandle* handle, | 289 WebKit::WebSocketStreamHandle* handle, |
289 webkit_glue::WebSocketStreamHandleDelegate* delegate) { | 290 webkit_glue::WebSocketStreamHandleDelegate* delegate) { |
290 return SimpleSocketStreamBridge::Create(handle, delegate); | 291 return SimpleSocketStreamBridge::Create(handle, delegate); |
291 } | 292 } |
OLD | NEW |