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 afd843ac393ebfbd156b9976a0b7bef38692f3a9..2dc7dc871695a59862b81d736cc2551ef74e31ea 100644 |
--- a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc |
+++ b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc |
@@ -118,6 +118,10 @@ WebGraphicsContext3DInProcessCommandBufferImpl:: |
~WebGraphicsContext3DInProcessCommandBufferImpl() { |
} |
+size_t WebGraphicsContext3DInProcessCommandBufferImpl::GetMappedMemoryLimit() { |
+ return context_->GetMappedMemoryLimit(); |
+} |
+ |
bool WebGraphicsContext3DInProcessCommandBufferImpl::MaybeInitializeGL() { |
if (initialized_) |
return true; |
@@ -135,15 +139,17 @@ bool WebGraphicsContext3DInProcessCommandBufferImpl::MaybeInitializeGL() { |
// will need to be lost either when the first context requesting the |
// discrete GPU is created, or the last one is destroyed. |
gfx::GpuPreference gpu_preference = gfx::PreferDiscreteGpu; |
- context_.reset(GLInProcessContext::Create(NULL, /* service */ |
- NULL, /* surface */ |
- is_offscreen_, |
- window_, |
- gfx::Size(1, 1), |
- NULL, /* share_context */ |
- share_resources_, |
- attribs_, |
- gpu_preference)); |
+ context_.reset(GLInProcessContext::Create( |
+ NULL, /* service */ |
+ NULL, /* surface */ |
+ is_offscreen_, |
+ window_, |
+ gfx::Size(1, 1), |
+ NULL, /* share_context */ |
+ share_resources_, |
+ attribs_, |
+ gpu_preference, |
+ ::gpu::GLInProcessContextSharedMemoryLimits())); |
} |
if (context_) { |