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

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

Issue 1328001: Added command buffer implementation of WebGL which runs in the sandbox.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 9 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 #if defined(USE_SYSTEM_SQLITE) 7 #if defined(USE_SYSTEM_SQLITE)
8 #include <sqlite3.h> 8 #include <sqlite3.h>
9 #else 9 #else
10 #include "third_party/sqlite/preprocessed/sqlite3.h" 10 #include "third_party/sqlite/preprocessed/sqlite3.h"
11 #endif 11 #endif
12 12
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/file_path.h" 14 #include "base/file_path.h"
15 #include "base/platform_file.h" 15 #include "base/platform_file.h"
16 #include "chrome/common/appcache/appcache_dispatcher.h" 16 #include "chrome/common/appcache/appcache_dispatcher.h"
17 #include "chrome/common/chrome_switches.h" 17 #include "chrome/common/chrome_switches.h"
18 #include "chrome/common/db_message_filter.h" 18 #include "chrome/common/db_message_filter.h"
19 #include "chrome/common/render_messages.h" 19 #include "chrome/common/render_messages.h"
20 #include "chrome/common/webmessageportchannel_impl.h" 20 #include "chrome/common/webmessageportchannel_impl.h"
21 #include "chrome/plugin/npobject_util.h" 21 #include "chrome/plugin/npobject_util.h"
22 #include "chrome/renderer/net/render_dns_master.h" 22 #include "chrome/renderer/net/render_dns_master.h"
23 #include "chrome/renderer/render_thread.h" 23 #include "chrome/renderer/render_thread.h"
24 #include "chrome/renderer/render_view.h" 24 #include "chrome/renderer/render_view.h"
25 #include "chrome/renderer/renderer_webstoragenamespace_impl.h" 25 #include "chrome/renderer/renderer_webstoragenamespace_impl.h"
26 #include "chrome/renderer/visitedlink_slave.h" 26 #include "chrome/renderer/visitedlink_slave.h"
27 #include "chrome/renderer/webgraphicscontext3d_command_buffer_impl.h"
27 #include "googleurl/src/gurl.h" 28 #include "googleurl/src/gurl.h"
28 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" 29 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
30 #include "third_party/WebKit/WebKit/chromium/public/WebGraphicsContext3D.h"
29 #include "third_party/WebKit/WebKit/chromium/public/WebStorageEventDispatcher.h" 31 #include "third_party/WebKit/WebKit/chromium/public/WebStorageEventDispatcher.h"
30 #include "third_party/WebKit/WebKit/chromium/public/WebString.h" 32 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
31 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h" 33 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
32 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h" 34 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
33 #include "webkit/appcache/web_application_cache_host_impl.h" 35 #include "webkit/appcache/web_application_cache_host_impl.h"
34 #include "webkit/glue/webkit_glue.h" 36 #include "webkit/glue/webkit_glue.h"
35 37
36 #if defined(OS_LINUX) 38 #if defined(OS_LINUX)
37 #include "chrome/renderer/renderer_sandbox_support_linux.h" 39 #include "chrome/renderer/renderer_sandbox_support_linux.h"
38 #endif 40 #endif
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 WebKit::WebSharedWorkerRepository* 334 WebKit::WebSharedWorkerRepository*
333 RendererWebKitClientImpl::sharedWorkerRepository() { 335 RendererWebKitClientImpl::sharedWorkerRepository() {
334 if (!CommandLine::ForCurrentProcess()->HasSwitch( 336 if (!CommandLine::ForCurrentProcess()->HasSwitch(
335 switches::kDisableSharedWorkers)) { 337 switches::kDisableSharedWorkers)) {
336 return &shared_worker_repository_; 338 return &shared_worker_repository_;
337 } else { 339 } else {
338 return NULL; 340 return NULL;
339 } 341 }
340 } 342 }
341 343
344 WebKit::WebGraphicsContext3D*
345 RendererWebKitClientImpl::createGraphicsContext3D() {
346 // TODO(kbr): remove the WebGraphicsContext3D::createDefault code path
347 // completely, and at least for a period of time, either pop up a warning
348 // dialog, or don't even start the browser, if WebGL is enabled and the
349 // sandbox isn't.
350 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoSandbox)) {
darin (slow to review) 2010/03/29 15:24:32 nit: it seems like a more specific command line sw
Ken Russell (switch to Gerrit) 2010/03/29 19:56:30 Good suggestion. Filed as http://crbug.com/39721 .
351 return WebKit::WebGraphicsContext3D::createDefault();
352 } else {
353 #if defined(ENABLE_GPU)
354 return new WebGraphicsContext3DCommandBufferImpl();
355 #else
356 return NULL;
357 #endif
358 }
359 }
360
342 //------------------------------------------------------------------------------ 361 //------------------------------------------------------------------------------
343 362
344 WebKit::WebString RendererWebKitClientImpl::signedPublicKeyAndChallengeString( 363 WebKit::WebString RendererWebKitClientImpl::signedPublicKeyAndChallengeString(
345 unsigned key_size_index, 364 unsigned key_size_index,
346 const WebKit::WebString& challenge, 365 const WebKit::WebString& challenge,
347 const WebKit::WebURL& url) { 366 const WebKit::WebURL& url) {
348 std::string signed_public_key; 367 std::string signed_public_key;
349 RenderThread::current()->Send(new ViewHostMsg_Keygen( 368 RenderThread::current()->Send(new ViewHostMsg_Keygen(
350 static_cast<uint32>(key_size_index), 369 static_cast<uint32>(key_size_index),
351 challenge.utf8(), 370 challenge.utf8(),
352 GURL(url), 371 GURL(url),
353 &signed_public_key)); 372 &signed_public_key));
354 return WebString::fromUTF8(signed_public_key); 373 return WebString::fromUTF8(signed_public_key);
355 } 374 }
OLDNEW
« no previous file with comments | « chrome/renderer/renderer_webkitclient_impl.h ('k') | chrome/renderer/webgraphicscontext3d_command_buffer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698