commit 8c9e0a0c767f8f5d0d5504fe906ad44ee4b7fd91
author fsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Apr 02 05:13:19 2012
committer fsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Apr 02 05:13:19 2012
tree dffee487b3f51ff7987f03f7c5e77bb3c864ac96
parent 3d0e98cee42dfd10e07460d712bc048f53f161d3

Merged ContentGLContext into WebGraphicsContext3DCommandBufferImpl

This allows WebGraphicsContext3DCommandBufferImpl to accept CommandBufferProxy's directly. 

Once PpapiCommandBufferProxy inherits from CommandBufferProxy, WebGraphcsContext3DCommandBufferImpl will be able to accept it and operate over a pepper channel.

BUG=120279
TEST=manually

Review URL: http://codereview.chromium.org/9800001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130094 0039d316-1c4b-4281-b951-d872f2087c98

content/renderer/render_view_impl.cc

diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 1856379f..b20addc 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1585,9 +1585,15 @@
 
     scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context(
         new WebGraphicsContext3DCommandBufferImpl(
-            surface_id(), url, RenderThreadImpl::current(), AsWeakPtr()));
+            surface_id(),
+            url,
+            RenderThreadImpl::current(),
+            AsWeakPtr()));
 
-    if (!context->Initialize(attributes))
+    if (!context->Initialize(
+            attributes,
+            false /* bind generates resources */,
+            content::CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE))
       return NULL;
     context_is_web_graphics_context_3d_command_buffer_impl_ = true;
     return context.release();