Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(235)

Side by Side Diff: webkit/tools/test_shell/test_shell_webkit_init.cc

Issue 9226036: Refactor WebGraphicsContext3DInProcess and TestWebGraphicsContext3D (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 const WebKit::WebString& keyPath) { 293 const WebKit::WebString& keyPath) {
294 return WebKit::WebIDBKey::injectIDBKeyIntoSerializedValue( 294 return WebKit::WebIDBKey::injectIDBKeyIntoSerializedValue(
295 key, value, WebKit::WebIDBKeyPath::create(keyPath)); 295 key, value, WebKit::WebIDBKeyPath::create(keyPath));
296 } 296 }
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* TestShellWebKitInit::createGraphicsContext3D() {
304 return new webkit::gpu::WebGraphicsContext3DInProcessImpl(
305 gfx::kNullPluginWindow, NULL);
306 }
307
308 void TestShellWebKitInit::GetPlugins( 303 void TestShellWebKitInit::GetPlugins(
309 bool refresh, std::vector<webkit::WebPluginInfo>* plugins) { 304 bool refresh, std::vector<webkit::WebPluginInfo>* plugins) {
310 if (refresh) 305 if (refresh)
311 webkit::npapi::PluginList::Singleton()->RefreshPlugins(); 306 webkit::npapi::PluginList::Singleton()->RefreshPlugins();
312 webkit::npapi::PluginList::Singleton()->GetPlugins(plugins); 307 webkit::npapi::PluginList::Singleton()->GetPlugins(plugins);
313 // Don't load the forked TestNetscapePlugIn in the chromium code, use 308 // Don't load the forked TestNetscapePlugIn in the chromium code, use
314 // the copy in webkit.org's repository instead. 309 // the copy in webkit.org's repository instead.
315 const FilePath::StringType kPluginBlackList[] = { 310 const FilePath::StringType kPluginBlackList[] = {
316 FILE_PATH_LITERAL("npapi_layout_test_plugin.dll"), 311 FILE_PATH_LITERAL("npapi_layout_test_plugin.dll"),
317 FILE_PATH_LITERAL("WebKitTestNetscapePlugIn.plugin"), 312 FILE_PATH_LITERAL("WebKitTestNetscapePlugIn.plugin"),
(...skipping 14 matching lines...) Expand all
332 const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) { 327 const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) {
333 return SimpleResourceLoaderBridge::Create(request_info); 328 return SimpleResourceLoaderBridge::Create(request_info);
334 } 329 }
335 330
336 webkit_glue::WebSocketStreamHandleBridge* 331 webkit_glue::WebSocketStreamHandleBridge*
337 TestShellWebKitInit::CreateWebSocketBridge( 332 TestShellWebKitInit::CreateWebSocketBridge(
338 WebKit::WebSocketStreamHandle* handle, 333 WebKit::WebSocketStreamHandle* handle,
339 webkit_glue::WebSocketStreamHandleDelegate* delegate) { 334 webkit_glue::WebSocketStreamHandleDelegate* delegate) {
340 return SimpleSocketStreamBridge::Create(handle, delegate); 335 return SimpleSocketStreamBridge::Create(handle, delegate);
341 } 336 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698