summaryrefslogtreecommitdiffstats
path: root/webkit/gpu
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-20 19:58:24 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-20 19:58:24 +0000
commit3c644d83d23318c6ba120e2303816369045f5964 (patch)
tree3f0a3b02ce1a4fd7cf8b68d3bb033be8ca8129dd /webkit/gpu
parent35c14eeb34ca5f21b70a388e868ff3968545812f (diff)
downloadchromium_src-3c644d83d23318c6ba120e2303816369045f5964.zip
chromium_src-3c644d83d23318c6ba120e2303816369045f5964.tar.gz
chromium_src-3c644d83d23318c6ba120e2303816369045f5964.tar.bz2
RendererGLContext supports reparenting a GL context.
This will allow the parenting of offscreen canvas contexts to be deferred until the compositor's view context exists, which in some cases needs to be deferred until the window is asynchronously created by the browser's UI thread. An example is JavaScript opening a popup window and then immediately using canvas to attempt to render to it. This patch alone does not fix the bug. BUG=80703 Review URL: http://codereview.chromium.org/7205012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89715 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/gpu')
-rw-r--r--webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc7
1 files changed, 0 insertions, 7 deletions
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
index 1f7e672..68a3486 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
+++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
@@ -588,24 +588,17 @@ bool GLInProcessContext::Initialize(bool onscreen,
::gpu::gles2::DisallowedExtensions(),
allowed_extensions,
attribs,
- NULL,
- 0,
share_group.get())) {
LOG(ERROR) << "Could not initialize GpuScheduler.";
command_buffer_.reset();
}
}
} else {
- GpuScheduler* parent_scheduler =
- parent_.get() ? parent_->gpu_scheduler_ : NULL;
-
if (!gpu_scheduler_->Initialize(render_surface,
size,
::gpu::gles2::DisallowedExtensions(),
allowed_extensions,
attribs,
- parent_scheduler,
- parent_texture_id_,
share_group.get())) {
LOG(ERROR) << "Could not initialize offscreen GpuScheduler.";
command_buffer_.reset();