Track managed memory usage in the command buffer.

content/common/gpu/gpu_memory_manager.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_GPU_MEMORY_MANAGER_H_
 #define CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_H_
 
 #if defined(ENABLE_GPU)
 
 #include <set>
@@ skipping 59 matching lines @@
   void RemoveClient(GpuMemoryManagerClient* client);
   void SetClientVisible(GpuMemoryManagerClient* client, bool visible);
   void SetClientManagedMemoryStats(GpuMemoryManagerClient* client,
                                    const GpuManagedMemoryStats& stats);
 
   // Add and remove structures to track context groups' memory consumption
   void AddTrackingGroup(GpuMemoryTrackingGroup* tracking_group);
   void RemoveTrackingGroup(GpuMemoryTrackingGroup* tracking_group);
 
   // Track a change in memory allocated by any context
-  void TrackMemoryAllocatedChange(size_t old_size, size_t new_size);
+  void TrackMemoryAllocatedChange(
+      size_t old_size,
+      size_t new_size,
+      gpu::gles2::MemoryTracker::Pool tracking_pool);
 
  private:
   friend class GpuMemoryManagerTest;
   FRIEND_TEST_ALL_PREFIXES(GpuMemoryManagerTest,
                            ComparatorTests);
   FRIEND_TEST_ALL_PREFIXES(GpuMemoryManagerTest,
                            TestManageBasicFunctionality);
   FRIEND_TEST_ALL_PREFIXES(GpuMemoryManagerTest,
                            TestManageChangingVisibility);
   FRIEND_TEST_ALL_PREFIXES(GpuMemoryManagerTest,
@@ skipping 77 matching lines @@
   size_t GetMaximumTabAllocation() const;
   size_t GetMinimumTabAllocation() const;
 
   // Get a reasonable memory limit from a viewport's surface area.
   static size_t CalcAvailableFromViewportArea(int viewport_area);
   static size_t CalcAvailableFromGpuTotal(size_t total_gpu_memory);
 
   // Send memory usage stats to the browser process.
   void SendUmaStatsToBrowser();
 
+  // Get the current number of bytes allocated.
+  size_t GetCurrentUsage() const {
+    return bytes_allocated_managed_current_ +
+        bytes_allocated_unmanaged_current_;
+  }
+
   // Interfaces for testing
   void TestingSetClientVisible(GpuMemoryManagerClient* client, bool visible);
   void TestingSetClientLastUsedTime(GpuMemoryManagerClient* client,
                                     base::TimeTicks last_used_time);
   void TestingSetClientHasSurface(GpuMemoryManagerClient* client,
                                   bool has_surface);
   bool TestingCompareClients(GpuMemoryManagerClient* lhs,
                              GpuMemoryManagerClient* rhs) const;
   void TestingDisableScheduleManage() { disable_schedule_manage_ = true; }
   void TestingSetAvailableGpuMemory(size_t bytes) {
@@ skipping 21 matching lines @@
 
   // The maximum amount of memory that may be allocated for GPU resources
   size_t bytes_available_gpu_memory_;
   bool bytes_available_gpu_memory_overridden_;
 
   // The maximum amount of memory that can be allocated for GPU resources
   // in backgrounded renderers.
   size_t bytes_backgrounded_available_gpu_memory_;
 
   // The current total memory usage, and historical maximum memory usage
-  size_t bytes_allocated_current_;
+  size_t bytes_allocated_managed_current_;
   size_t bytes_allocated_managed_visible_;
   size_t bytes_allocated_managed_backgrounded_;
+  size_t bytes_allocated_unmanaged_current_;
   size_t bytes_allocated_historical_max_;
 
   // The number of browser windows that exist. If we ever receive a
   // GpuMsg_SetVideoMemoryWindowCount, then we use this to compute memory
   // budgets, instead of doing more complicated stub-based calculations.
   bool window_count_has_been_received_;
   uint32 window_count_;
 
   // Used to disable automatic changes to Manage() in testing.
   bool disable_schedule_manage_;
@@ skipping 19 matching lines @@
   // context is currently rendering on. Returns false if no extension exists
   // to get the exact amount of GPU memory.
   virtual bool GetTotalGpuMemory(size_t* bytes) = 0;
 };
 
 }  // namespace content
 
 #endif
 
 #endif // CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_H_