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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/renderer_webkitclient_impl.cc
===================================================================
--- chrome/renderer/renderer_webkitclient_impl.cc (revision 42776)
+++ chrome/renderer/renderer_webkitclient_impl.cc (working copy)
@@ -24,8 +24,10 @@
#include "chrome/renderer/render_view.h"
#include "chrome/renderer/renderer_webstoragenamespace_impl.h"
#include "chrome/renderer/visitedlink_slave.h"
+#include "chrome/renderer/webgraphicscontext3d_command_buffer_impl.h"
#include "googleurl/src/gurl.h"
#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebGraphicsContext3D.h"
#include "third_party/WebKit/WebKit/chromium/public/WebStorageEventDispatcher.h"
#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
#include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
@@ -339,6 +341,23 @@
}
}
+WebKit::WebGraphicsContext3D*
+RendererWebKitClientImpl::createGraphicsContext3D() {
+ // TODO(kbr): remove the WebGraphicsContext3D::createDefault code path
+ // completely, and at least for a period of time, either pop up a warning
+ // dialog, or don't even start the browser, if WebGL is enabled and the
+ // sandbox isn't.
+ 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 .
+ return WebKit::WebGraphicsContext3D::createDefault();
+ } else {
+#if defined(ENABLE_GPU)
+ return new WebGraphicsContext3DCommandBufferImpl();
+#else
+ return NULL;
+#endif
+ }
+}
+
//------------------------------------------------------------------------------
WebKit::WebString RendererWebKitClientImpl::signedPublicKeyAndChallengeString(
« 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