| 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 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 | 297 |
| 298 WebKit::WebSharedWorkerRepository* | 298 WebKit::WebSharedWorkerRepository* |
| 299 TestShellWebKitInit::sharedWorkerRepository() { | 299 TestShellWebKitInit::sharedWorkerRepository() { |
| 300 return NULL; | 300 return NULL; |
| 301 } | 301 } |
| 302 | 302 |
| 303 WebKit::WebGraphicsContext3D* | 303 WebKit::WebGraphicsContext3D* |
| 304 TestShellWebKitInit::createOffscreenGraphicsContext3D( | 304 TestShellWebKitInit::createOffscreenGraphicsContext3D( |
| 305 const WebKit::WebGraphicsContext3D::Attributes& attributes) { | 305 const WebKit::WebGraphicsContext3D::Attributes& attributes) { |
| 306 return webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWebView( | 306 return webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWebView( |
| 307 attributes, NULL, false); | 307 attributes, false); |
| 308 } | 308 } |
| 309 | 309 |
| 310 void TestShellWebKitInit::GetPlugins( | 310 void TestShellWebKitInit::GetPlugins( |
| 311 bool refresh, std::vector<webkit::WebPluginInfo>* plugins) { | 311 bool refresh, std::vector<webkit::WebPluginInfo>* plugins) { |
| 312 if (refresh) | 312 if (refresh) |
| 313 webkit::npapi::PluginList::Singleton()->RefreshPlugins(); | 313 webkit::npapi::PluginList::Singleton()->RefreshPlugins(); |
| 314 webkit::npapi::PluginList::Singleton()->GetPlugins(plugins); | 314 webkit::npapi::PluginList::Singleton()->GetPlugins(plugins); |
| 315 // Don't load the forked TestNetscapePlugIn in the chromium code, use | 315 // Don't load the forked TestNetscapePlugIn in the chromium code, use |
| 316 // the copy in webkit.org's repository instead. | 316 // the copy in webkit.org's repository instead. |
| 317 const FilePath::StringType kPluginBlackList[] = { | 317 const FilePath::StringType kPluginBlackList[] = { |
| (...skipping 16 matching lines...) Expand all Loading... |
| 334 const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) { | 334 const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) { |
| 335 return SimpleResourceLoaderBridge::Create(request_info); | 335 return SimpleResourceLoaderBridge::Create(request_info); |
| 336 } | 336 } |
| 337 | 337 |
| 338 webkit_glue::WebSocketStreamHandleBridge* | 338 webkit_glue::WebSocketStreamHandleBridge* |
| 339 TestShellWebKitInit::CreateWebSocketBridge( | 339 TestShellWebKitInit::CreateWebSocketBridge( |
| 340 WebKit::WebSocketStreamHandle* handle, | 340 WebKit::WebSocketStreamHandle* handle, |
| 341 webkit_glue::WebSocketStreamHandleDelegate* delegate) { | 341 webkit_glue::WebSocketStreamHandleDelegate* delegate) { |
| 342 return SimpleSocketStreamBridge::Create(handle, delegate); | 342 return SimpleSocketStreamBridge::Create(handle, delegate); |
| 343 } | 343 } |
| OLD | NEW |