Move SharedMemoryLimits out of WebGraphicsContext3DCommandBufferImpl.

content/common/gpu/client/context_provider_command_buffer.cc

Index: content/common/gpu/client/context_provider_command_buffer.cc
diff --git a/content/common/gpu/client/context_provider_command_buffer.cc b/content/common/gpu/client/context_provider_command_buffer.cc
index 4ef4e17f5deff65e174d71264ea2ef313f11efe2..f6caa578179ea81728e331a7d1e7b07a1c90f3c3 100644
--- a/content/common/gpu/client/context_provider_command_buffer.cc
+++ b/content/common/gpu/client/context_provider_command_buffer.cc
@@ -38,8 +38,10 @@ class ContextProviderCommandBuffer::LostContextCallbackProxy
 
 ContextProviderCommandBuffer::ContextProviderCommandBuffer(
     std::unique_ptr<WebGraphicsContext3DCommandBufferImpl> context3d,
+    const gpu::SharedMemoryLimits& memory_limits,
     CommandBufferContextType type)
     : context3d_(std::move(context3d)),
+      memory_limits_(memory_limits),
       context_type_(type),
       debug_name_(CommandBufferContextTypeToString(type)) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
@@ -79,11 +81,9 @@ bool ContextProviderCommandBuffer::BindToCurrentThread() {
     return true;
 
   context3d_->SetContextType(context_type_);
-  if (!context3d_->InitializeOnCurrentThread())
+  if (!context3d_->InitializeOnCurrentThread(memory_limits_))
     return false;
 
-  InitializeCapabilities();
-
   std::string unique_context_name =
       base::StringPrintf("%s-%p", debug_name_.c_str(), context3d_.get());
   context3d_->GetGLInterface()->TraceBeginCHROMIUM("gpu_toplevel",
@@ -144,12 +144,10 @@ base::Lock* ContextProviderCommandBuffer::GetLock() {
   return &context_lock_;
 }
 
-cc::ContextProvider::Capabilities
-ContextProviderCommandBuffer::ContextCapabilities() {
+gpu::Capabilities ContextProviderCommandBuffer::ContextCapabilities() {
   DCHECK(lost_context_callback_proxy_);  // Is bound to thread.
   DCHECK(context_thread_checker_.CalledOnValidThread());
-
-  return capabilities_;
+  return context3d_->GetImplementation()->capabilities();
 }
 
 void ContextProviderCommandBuffer::DeleteCachedResources() {
@@ -168,18 +166,6 @@ void ContextProviderCommandBuffer::OnLostContext() {
     gr_context_->OnLostContext();
 }
 
-void ContextProviderCommandBuffer::InitializeCapabilities() {
-  Capabilities caps;
-  caps.gpu = context3d_->GetImplementation()->capabilities();
-
-  size_t mapped_memory_limit = context3d_->GetMappedMemoryLimit();
-  caps.max_transfer_buffer_usage_bytes =
-      mapped_memory_limit == WebGraphicsContext3DCommandBufferImpl::kNoLimit
-      ? std::numeric_limits<size_t>::max() : mapped_memory_limit;
-
-  capabilities_ = caps;
-}
-
 void ContextProviderCommandBuffer::SetLostContextCallback(
     const LostContextCallback& lost_context_callback) {
   DCHECK(context_thread_checker_.CalledOnValidThread());