summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-03 21:48:25 +0000
committerjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-03 21:48:25 +0000
commit8760b7c814cf5b5573eae468ae316aaf32d91ccd (patch)
treef69273bca13dd474a5a118353f47fc5a4019b59b
parent6cfe3891c0d2afe4bd7e7717c22c470575cb142b (diff)
downloadchromium_src-8760b7c814cf5b5573eae468ae316aaf32d91ccd.zip
chromium_src-8760b7c814cf5b5573eae468ae316aaf32d91ccd.tar.gz
chromium_src-8760b7c814cf5b5573eae468ae316aaf32d91ccd.tar.bz2
Removed unused methods in WebGraphicsContext3DCommandBufferImpl
Review URL: http://codereview.chromium.org/7024027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87878 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc21
-rw-r--r--content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h5
2 files changed, 3 insertions, 23 deletions
diff --git a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc
index 8b026ac..69ab6db 100644
--- a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc
+++ b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc
@@ -231,16 +231,6 @@ void WebGraphicsContext3DCommandBufferImpl::reshape(int width, int height) {
#endif // FLIP_FRAMEBUFFER_VERTICALLY
}
-WebGLId WebGraphicsContext3DCommandBufferImpl::createCompositorTexture(
- WGC3Dsizei width, WGC3Dsizei height) {
- return context_->CreateParentTexture(gfx::Size(width, height));
-}
-
-void WebGraphicsContext3DCommandBufferImpl::deleteCompositorTexture(
- WebGLId parent_texture) {
- context_->DeleteParentTexture(parent_texture);
-}
-
#ifdef FLIP_FRAMEBUFFER_VERTICALLY
void WebGraphicsContext3DCommandBufferImpl::FlipVertically(
uint8* framebuffer,
@@ -347,7 +337,9 @@ void WebGraphicsContext3DCommandBufferImpl::unmapTexSubImage2DCHROMIUM(
void WebGraphicsContext3DCommandBufferImpl::copyTextureToParentTextureCHROMIUM(
WebGLId texture, WebGLId parentTexture) {
- copyTextureToCompositor(texture, parentTexture);
+ TRACE_EVENT0("gpu", "WebGfxCtx3DCmdBfrImpl::copyTextureToCompositor");
+ gl_->CopyTextureToParentTextureCHROMIUM(texture, parentTexture);
+ gl_->Flush();
}
void WebGraphicsContext3DCommandBufferImpl::getParentToChildLatchCHROMIUM(
@@ -1018,13 +1010,6 @@ void WebGraphicsContext3DCommandBufferImpl::deleteTexture(WebGLId texture) {
gl_->DeleteTextures(1, &texture);
}
-void WebGraphicsContext3DCommandBufferImpl::copyTextureToCompositor(
- WebGLId texture, WebGLId parentTexture) {
- TRACE_EVENT0("gpu", "WebGfxCtx3DCmdBfrImpl::copyTextureToCompositor");
- gl_->CopyTextureToParentTextureCHROMIUM(texture, parentTexture);
- gl_->Flush();
-}
-
void WebGraphicsContext3DCommandBufferImpl::OnSwapBuffersComplete() {
// This may be called after tear-down of the RenderView.
RenderView* renderview =
diff --git a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h
index 84a4706..c9eabeb 100644
--- a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h
+++ b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h
@@ -421,11 +421,6 @@ class WebGraphicsContext3DCommandBufferImpl
WGC3Denum target, WGC3Dsizei samples, WGC3Denum internalformat,
WGC3Dsizei width, WGC3Dsizei height);
- virtual WebGLId createCompositorTexture(WGC3Dsizei width, WGC3Dsizei height);
- virtual void deleteCompositorTexture(WebGLId parent_texture);
- virtual void copyTextureToCompositor(WebGLId texture,
- WebGLId parent_texture);
-
RendererGLContext* context() { return context_; }
virtual void setContextLostCallback(