Splitting GpuMemoryAllocation into two parts: for renderer and browser

content/common/gpu/client/content_gl_context.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.
 
 // This API is consistent with other OpenGL setup APIs like window's WGL
 // and pepper's PGL. This API is used to manage OpenGL ContentGLContexts in the
 // Chrome renderer process in a way that is consistent with other platforms.
 
 #ifndef CONTENT_COMMON_GPU_CLIENT_RENDERER_GL_CONTEXT_H_
 #define CONTENT_COMMON_GPU_CLIENT_RENDERER_GL_CONTEXT_H_
 #pragma once
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "build/build_config.h"
 #include "ui/gfx/gl/gpu_preference.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 
 class GpuChannelHost;
 class CommandBufferProxy;
 class GURL;
-class GpuMemoryAllocation;
+struct GpuMemoryAllocationForRenderer;
 
 namespace gpu {
 class TransferBuffer;
 namespace gles2 {
 class GLES2CmdHelper;
 class GLES2Implementation;
 }
 }
 
 class ContentGLContext : public base::SupportsWeakPtr<ContentGLContext>,
@@ skipping 120 matching lines @@
 
   // Run the task once the channel has been flushed. Takes care of deleting the
   // task whether the echo succeeds or not.
   bool Echo(const base::Closure& task);
 
   // Sends an IPC message with the new state of surface visibility
   bool SetSurfaceVisible(bool visibility);
 
   // Register a callback to invoke whenever we recieve a new memory allocation.
   void SetMemoryAllocationChangedCallback(
-      const base::Callback<void(const GpuMemoryAllocation&)>& callback);
+      const base::Callback<void(const GpuMemoryAllocationForRenderer&)>&
+          callback);
 
   // TODO(gman): Remove this
   void DisableShaderTranslation();
 
   // Allows direct access to the GLES2 implementation so a ContentGLContext
   // can be used without making it current.
   gpu::gles2::GLES2Implementation* GetImplementation();
 
   // Return the current error.
   Error GetError();
@@ skipping 35 matching lines @@
   gpu::gles2::GLES2CmdHelper* gles2_helper_;
   gpu::TransferBuffer* transfer_buffer_;
   gpu::gles2::GLES2Implementation* gles2_implementation_;
   Error last_error_;
   int frame_number_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentGLContext);
 };
 
 #endif  // CONTENT_COMMON_GPU_CLIENT_RENDERER_GL_CONTEXT_H_