From dd6cfa63b3bff8689ffbbc96fefe9375507597dc Mon Sep 17 00:00:00 2001 From: "kbr@google.com" Date: Tue, 21 Sep 2010 21:57:02 +0000 Subject: Deleted WebGLES2ContextImpl and references to it and WebGLES2Context. This is a prerequisite to deletion of GLES2Context and WebGLES2Context from the WebKit repository. There is a TODO, to which the video stack team has agreed, to switch over the experimental hardware-accelerated video decoding from WebGLES2Context to WebGraphicsContext3D. The remaining vestige, removal of the implementation of WebGraphicsContext3D::initialize(Attributes, WebView*), will occur once the associated method is deleted from WebKit. Built and tested 3D CSS and WebGL content on Mac OS X and Windows. BUG=52863 TEST=none Review URL: http://codereview.chromium.org/3449017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60113 0039d316-1c4b-4281-b951-d872f2087c98 --- .../webgraphicscontext3d_command_buffer_impl.cc | 35 +--------------------- 1 file changed, 1 insertion(+), 34 deletions(-) (limited to 'chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc') diff --git a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc index da789a4..e6e3fd5 100644 --- a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc +++ b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc @@ -21,7 +21,6 @@ #include "chrome/renderer/gpu_channel_host.h" #include "chrome/renderer/render_thread.h" #include "chrome/renderer/render_view.h" -#include "chrome/renderer/webgles2context_impl.h" #include "third_party/WebKit/WebKit/chromium/public/WebView.h" WebGraphicsContext3DCommandBufferImpl::WebGraphicsContext3DCommandBufferImpl() @@ -113,39 +112,7 @@ bool WebGraphicsContext3DCommandBufferImpl::initialize( bool WebGraphicsContext3DCommandBufferImpl::initialize( WebGraphicsContext3D::Attributes attributes, WebKit::WebView* web_view) { - bool compositing_enabled = !CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableAcceleratedCompositing); - ggl::Context* parent_context = NULL; - // If GPU compositing is enabled we need to create a GL context that shares - // resources with the compositor's context. - if (compositing_enabled) { - // Asking for the GLES2Context on the WebView will force one to be created - // if it doesn't already exist. When the compositor is created for the view - // it will use the same context. - WebKit::WebGLES2Context* view_gles2_context = web_view->gles2Context(); - if (!view_gles2_context) - return false; - WebGLES2ContextImpl* context_impl = - static_cast(view_gles2_context); - parent_context = context_impl->context(); - } - - RenderThread* render_thread = RenderThread::current(); - if (!render_thread) - return false; - GpuChannelHost* host = render_thread->EstablishGpuChannelSync(); - if (!host) - return false; - DCHECK(host->state() == GpuChannelHost::CONNECTED); - context_ = ggl::CreateOffscreenContext(host, parent_context, gfx::Size(1, 1)); - if (!context_) - return false; - // TODO(gman): Remove this. - const CommandLine& command_line = *CommandLine::ForCurrentProcess(); - if (command_line.HasSwitch(switches::kDisableGLSLTranslator)) { - DisableShaderTranslation(context_); - } - return true; + return false; } bool WebGraphicsContext3DCommandBufferImpl::makeContextCurrent() { -- cgit v1.1