diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-22 18:16:39 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-22 18:16:39 +0000 |
| commit | 9a5afa438ce7f913cfede4bfbe3e719e5adfdd0a (patch) | |
| tree | 2d93550e7d0d11219d2d0b0464acb92d73ad32e8 /webkit/gpu/webgraphicscontext3d_in_process_impl.cc | |
| parent | 0b2cec69a613d94f2ee72743ba53f539843e85e3 (diff) | |
| download | chromium_src-9a5afa438ce7f913cfede4bfbe3e719e5adfdd0a.zip chromium_src-9a5afa438ce7f913cfede4bfbe3e719e5adfdd0a.tar.gz chromium_src-9a5afa438ce7f913cfede4bfbe3e719e5adfdd0a.tar.bz2 | |
Reland 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.
Original review: http://codereview.chromium.org/7237009
A patch that this was dependent on was reverting, causing this one to break 2D canvas. The patch is relanded. Relanding this one as well.
Review URL: http://codereview.chromium.org/7488001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93677 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/gpu/webgraphicscontext3d_in_process_impl.cc')
| -rw-r--r-- | webkit/gpu/webgraphicscontext3d_in_process_impl.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc index 0b5f75d..3564d24 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc @@ -300,6 +300,11 @@ bool WebGraphicsContext3DInProcessImpl::isGLES2Compliant() { return is_gles2_; } +bool WebGraphicsContext3DInProcessImpl::setParentContext( + WebGraphicsContext3D* parent_context) { + return false; +} + WebGLId WebGraphicsContext3DInProcessImpl::getPlatformTextureId() { return texture_; } |