Move SharedMemoryLimits out of WebGraphicsContext3DCommandBufferImpl.

content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_COMMON_GPU_CLIENT_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_
 #define CONTENT_COMMON_GPU_CLIENT_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 13 matching lines @@
 #include "gpu/ipc/common/surface_handle.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "ui/gl/gpu_preference.h"
 #include "url/gurl.h"
 
 namespace gpu {
 
 class ContextSupport;
 class GpuChannelHost;
+struct SharedMemoryLimits;
 class TransferBuffer;
 
 namespace gles2 {
 class GLES2CmdHelper;
 class GLES2Implementation;
 class GLES2Interface;
 }
 }
 
 namespace content {
 
 const size_t kDefaultCommandBufferSize = 1024 * 1024;
 const size_t kDefaultStartTransferBufferSize = 1 * 1024 * 1024;
 const size_t kDefaultMinTransferBufferSize = 1 * 256 * 1024;
 const size_t kDefaultMaxTransferBufferSize = 16 * 1024 * 1024;
 
 class WebGraphicsContext3DCommandBufferImpl
     : public gpu_blink::WebGraphicsContext3DImpl {
  public:
   enum MappedMemoryReclaimLimit {
     kNoLimit = 0,
   };
 
-  struct CONTENT_EXPORT SharedMemoryLimits {
-    SharedMemoryLimits();
-
-    size_t command_buffer_size;
-    size_t start_transfer_buffer_size;
-    size_t min_transfer_buffer_size;
-    size_t max_transfer_buffer_size;
-    size_t mapped_memory_reclaim_limit;
-  };
-
   class ShareGroup : public base::RefCountedThreadSafe<ShareGroup> {
    public:
     ShareGroup();
 
     WebGraphicsContext3DCommandBufferImpl* GetAnyContextLocked() {
       // In order to ensure that the context returned is not removed while
       // in use, the share group's lock should be aquired before calling this
       // function.
       lock_.AssertAcquired();
       if (contexts_.empty())
@@ skipping 32 matching lines @@
   };
 
   CONTENT_EXPORT WebGraphicsContext3DCommandBufferImpl(
       gpu::SurfaceHandle surface_handle,
       const GURL& active_url,
       gpu::GpuChannelHost* host,
       const gpu::gles2::ContextCreationAttribHelper& attributes,
       gfx::GpuPreference gpu_preference,
       bool share_resources,
       bool automatic_flushes,
-      const SharedMemoryLimits& limits,
       WebGraphicsContext3DCommandBufferImpl* share_context);
 
   ~WebGraphicsContext3DCommandBufferImpl() override;
 
   gpu::CommandBufferProxyImpl* GetCommandBufferProxy() {
     return command_buffer_.get();
   }
 
   CONTENT_EXPORT gpu::ContextSupport* GetContextSupport();
 
   gpu::gles2::GLES2Implementation* GetImplementation() {
     return real_gl_.get();
   }
 
-  size_t GetMappedMemoryLimit() {
-    return mem_limits_.mapped_memory_reclaim_limit;
-  }
-
-  CONTENT_EXPORT bool InitializeOnCurrentThread();
+  CONTENT_EXPORT bool InitializeOnCurrentThread(
+      const gpu::SharedMemoryLimits& memory_limits);
 
   void SetContextType(CommandBufferContextType type) {
     context_type_ = type;
   }
  private:
   // These are the same error codes as used by EGL.
   enum Error {
     SUCCESS               = 0x3000,
     BAD_ATTRIBUTE         = 0x3004,
     CONTEXT_LOST          = 0x300E
   };
 
   // Initialize the underlying GL context. May be called multiple times; second
   // and subsequent calls are ignored. Must be called from the thread that is
   // going to use this object to issue GL commands (which might not be the main
   // thread).
-  bool MaybeInitializeGL();
+  bool MaybeInitializeGL(const gpu::SharedMemoryLimits& memory_limits);
 
   bool InitializeCommandBuffer(
       WebGraphicsContext3DCommandBufferImpl* share_context);
 
   void Destroy();
 
   // Create a CommandBufferProxy that renders directly to a view. The view and
   // the associated window must not be destroyed until the returned
   // CommandBufferProxy has been destroyed, otherwise the GPU process might
   // attempt to render to an invalid window handle.
   //
   // NOTE: on Mac OS X, this entry point is only used to set up the
   // accelerated compositor's output. On this platform, we actually pass
   // a gpu::SurfaceHandle in place of the gfx::NativeViewId,
   // because the facility to allocate a fake PluginWindowHandle is
   // already in place. We could add more entry points and messages to
   // allocate both fake PluginWindowHandles and NativeViewIds and map
   // from fake NativeViewIds to PluginWindowHandles, but this seems like
   // unnecessary complexity at the moment.
-  bool CreateContext();
+  bool CreateContext(const gpu::SharedMemoryLimits& memory_limits);
 
   void OnContextLost();
 
   bool automatic_flushes_;
   gpu::gles2::ContextCreationAttribHelper attributes_;
 
   // State needed by MaybeInitializeGL.
   scoped_refptr<gpu::GpuChannelHost> host_;
   gpu::SurfaceHandle surface_handle_;
   GURL active_url_;
   CommandBufferContextType context_type_;
 
   gfx::GpuPreference gpu_preference_;
 
   std::unique_ptr<gpu::CommandBufferProxyImpl> command_buffer_;
   std::unique_ptr<gpu::gles2::GLES2CmdHelper> gles2_helper_;
   std::unique_ptr<gpu::TransferBuffer> transfer_buffer_;
   std::unique_ptr<gpu::gles2::GLES2Implementation> real_gl_;
   std::unique_ptr<gpu::gles2::GLES2Interface> trace_gl_;
-  SharedMemoryLimits mem_limits_;
   scoped_refptr<ShareGroup> share_group_;
 
   // Member variables should appear before the WeakPtrFactory, to ensure
   // that any WeakPtrs to Controller are invalidated before its members
   // variable's destructors are executed, rendering them invalid.
   base::WeakPtrFactory<WebGraphicsContext3DCommandBufferImpl> weak_ptr_factory_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_CLIENT_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_