From 5435e933450b28154d6ab7e96bf46c86c2d4962e Mon Sep 17 00:00:00 2001 From: "apatrick@chromium.org" Date: Wed, 20 Jul 2011 20:27:36 +0000 Subject: Revert 93106 - Reparenting of RendererGLContexts supports going from no parent to having a parent. RendererGLContext::SetParent is a no-op if the parent did not change to avoid a redundant sync IPC. Added SetParentContext to WebGraphicsContext3DCommandBufferImpl. WebKit change to follow. Review URL: http://codereview.chromium.org/7237009 TBR=apatrick@chromium.org Review URL: http://codereview.chromium.org/7475001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93244 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc | 5 ----- webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h | 2 -- webkit/gpu/webgraphicscontext3d_in_process_impl.cc | 5 ----- webkit/gpu/webgraphicscontext3d_in_process_impl.h | 2 -- 4 files changed, 14 deletions(-) (limited to 'webkit/gpu') diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc index 5e91359..0b623cc 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc @@ -879,11 +879,6 @@ bool WebGraphicsContext3DInProcessCommandBufferImpl::isGLES2Compliant() { return true; } -bool WebGraphicsContext3DInProcessCommandBufferImpl::setParentContext( - WebGraphicsContext3D* parent_context) { - return false; -} - WebGLId WebGraphicsContext3DInProcessCommandBufferImpl::getPlatformTextureId() { DCHECK(context_); return context_->GetParentTextureId(); diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h index ce6ce46..5e2df99 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h @@ -65,8 +65,6 @@ class WebGraphicsContext3DInProcessCommandBufferImpl virtual bool isGLES2Compliant(); - virtual bool setParentContext(WebGraphicsContext3D* parent_context); - virtual void reshape(int width, int height); virtual bool readBackFramebuffer(unsigned char* pixels, size_t buffer_size); diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc index a729099..e7d5757 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc @@ -298,11 +298,6 @@ bool WebGraphicsContext3DInProcessImpl::isGLES2Compliant() { return is_gles2_; } -bool WebGraphicsContext3DInProcessImpl::setParentContext( - WebGraphicsContext3D* parent_context) { - return false; -} - WebGLId WebGraphicsContext3DInProcessImpl::getPlatformTextureId() { return texture_; } diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_impl.h index 05bc06d..aafff28 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_impl.h +++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.h @@ -65,8 +65,6 @@ class WebGraphicsContext3DInProcessImpl : public WebGraphicsContext3D { virtual bool isGLES2Compliant(); - virtual bool setParentContext(WebGraphicsContext3D* parent_context); - virtual void reshape(int width, int height); virtual bool readBackFramebuffer(unsigned char* pixels, size_t bufferSize); -- cgit v1.1