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

Side by Side Diff: chrome/renderer/renderer_webkitclient_impl.cc

Issue 6100009: Move the in-process WebGL implementation from the WebKit to the... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/renderer/renderer_webkitclient_impl.h" 5 #include "chrome/renderer/renderer_webkitclient_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/platform_file.h" 9 #include "base/platform_file.h"
10 #include "base/shared_memory.h" 10 #include "base/shared_memory.h"
(...skipping 24 matching lines...) Expand all
35 #include "third_party/WebKit/WebKit/chromium/public/WebIDBKey.h" 35 #include "third_party/WebKit/WebKit/chromium/public/WebIDBKey.h"
36 #include "third_party/WebKit/WebKit/chromium/public/WebIDBKeyPath.h" 36 #include "third_party/WebKit/WebKit/chromium/public/WebIDBKeyPath.h"
37 #include "third_party/WebKit/WebKit/chromium/public/WebSerializedScriptValue.h" 37 #include "third_party/WebKit/WebKit/chromium/public/WebSerializedScriptValue.h"
38 #include "third_party/WebKit/WebKit/chromium/public/WebStorageEventDispatcher.h" 38 #include "third_party/WebKit/WebKit/chromium/public/WebStorageEventDispatcher.h"
39 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h" 39 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
40 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h" 40 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
41 #include "webkit/glue/simple_webmimeregistry_impl.h" 41 #include "webkit/glue/simple_webmimeregistry_impl.h"
42 #include "webkit/glue/webclipboard_impl.h" 42 #include "webkit/glue/webclipboard_impl.h"
43 #include "webkit/glue/webfileutilities_impl.h" 43 #include "webkit/glue/webfileutilities_impl.h"
44 #include "webkit/glue/webkit_glue.h" 44 #include "webkit/glue/webkit_glue.h"
45 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
45 46
46 #if defined(OS_WIN) 47 #if defined(OS_WIN)
47 #include "third_party/WebKit/WebKit/chromium/public/win/WebSandboxSupport.h" 48 #include "third_party/WebKit/WebKit/chromium/public/win/WebSandboxSupport.h"
48 #endif 49 #endif
49 50
50 #if defined(OS_MACOSX) 51 #if defined(OS_MACOSX)
51 #include "chrome/common/font_descriptor_mac.h" 52 #include "chrome/common/font_descriptor_mac.h"
52 #include "chrome/common/font_loader_mac.h" 53 #include "chrome/common/font_loader_mac.h"
53 #include "third_party/WebKit/WebKit/chromium/public/mac/WebSandboxSupport.h" 54 #include "third_party/WebKit/WebKit/chromium/public/mac/WebSandboxSupport.h"
54 #endif 55 #endif
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 if (!CommandLine::ForCurrentProcess()->HasSwitch( 498 if (!CommandLine::ForCurrentProcess()->HasSwitch(
498 switches::kDisableSharedWorkers)) { 499 switches::kDisableSharedWorkers)) {
499 return shared_worker_repository_.get(); 500 return shared_worker_repository_.get();
500 } else { 501 } else {
501 return NULL; 502 return NULL;
502 } 503 }
503 } 504 }
504 505
505 WebKit::WebGraphicsContext3D* 506 WebKit::WebGraphicsContext3D*
506 RendererWebKitClientImpl::createGraphicsContext3D() { 507 RendererWebKitClientImpl::createGraphicsContext3D() {
507 // The WebGraphicsContext3D::createDefault code path is used for 508 // The WebGraphicsContext3DInProcessImpl code path is used for
508 // layout tests (though not through this code) as well as for 509 // layout tests (though not through this code) as well as for
509 // debugging and bringing up new ports. 510 // debugging and bringing up new ports.
510 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessWebGL)) { 511 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessWebGL)) {
511 return WebKit::WebGraphicsContext3D::createDefault(); 512 return new webkit_gpu::WebGraphicsContext3DInProcessImpl();
512 } else { 513 } else {
513 #if defined(ENABLE_GPU) 514 #if defined(ENABLE_GPU)
514 return new WebGraphicsContext3DCommandBufferImpl(); 515 return new WebGraphicsContext3DCommandBufferImpl();
515 #else 516 #else
516 return NULL; 517 return NULL;
517 #endif 518 #endif
518 } 519 }
519 } 520 }
520 521
521 //------------------------------------------------------------------------------ 522 //------------------------------------------------------------------------------
(...skipping 11 matching lines...) Expand all
533 return WebString::fromUTF8(signed_public_key); 534 return WebString::fromUTF8(signed_public_key);
534 } 535 }
535 536
536 //------------------------------------------------------------------------------ 537 //------------------------------------------------------------------------------
537 538
538 WebBlobRegistry* RendererWebKitClientImpl::blobRegistry() { 539 WebBlobRegistry* RendererWebKitClientImpl::blobRegistry() {
539 if (!blob_registry_.get()) 540 if (!blob_registry_.get())
540 blob_registry_.reset(new WebBlobRegistryImpl(RenderThread::current())); 541 blob_registry_.reset(new WebBlobRegistryImpl(RenderThread::current()));
541 return blob_registry_.get(); 542 return blob_registry_.get();
542 } 543 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698