Index: webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc |
diff --git a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc |
index b230e06c8a41c79cdee3f817ed996e7ca2f8fea0..1a166860502a24080b3c28150c0131c7183d978c 100644 |
--- a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc |
+++ b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc |
@@ -111,11 +111,6 @@ class GLInProcessContext { |
const int32* attrib_list, |
gfx::GpuPreference gpu_preference); |
- // For an offscreen frame buffer GLInProcessContext, return the texture ID |
- // with respect to the parent GLInProcessContext. Returns zero if |
- // GLInProcessContext does not have a parent. |
- uint32 GetParentTextureId(); |
- |
// Create a new texture in the parent's GLInProcessContext. Returns zero if |
// GLInProcessContext does not have a parent. |
uint32 CreateParentTexture(const gfx::Size& size); |
@@ -400,10 +395,6 @@ bool GLInProcessContext::GetBufferChanged(int32 transfer_buffer_id) { |
return gpu_scheduler_->SetGetBuffer(transfer_buffer_id); |
} |
-uint32 GLInProcessContext::GetParentTextureId() { |
- return 0; |
-} |
- |
uint32 GLInProcessContext::CreateParentTexture(const gfx::Size& size) { |
uint32 texture = 0; |
gles2_implementation_->GenTextures(1, &texture); |
@@ -935,20 +926,11 @@ int WebGraphicsContext3DInProcessCommandBufferImpl::height() { |
return cached_height_; |
} |
-bool WebGraphicsContext3DInProcessCommandBufferImpl::isGLES2Compliant() { |
- return true; |
-} |
- |
bool WebGraphicsContext3DInProcessCommandBufferImpl::setParentContext( |
WebGraphicsContext3D* parent_context) { |
return false; |
} |
-WebGLId WebGraphicsContext3DInProcessCommandBufferImpl::getPlatformTextureId() { |
- DCHECK(context_); |
- return context_->GetParentTextureId(); |
-} |
- |
void WebGraphicsContext3DInProcessCommandBufferImpl::prepareTexture() { |
// Copies the contents of the off-screen render target into the texture |
// used by the compositor. |