Add GPU memory tab to the task manager.

content/common/gpu/gpu_command_buffer_stub.cc

 // 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.
 
 #if defined(ENABLE_GPU)
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 20 matching lines @@
 #if defined(OS_WIN)
 #include "content/public/common/sandbox_init.h"
 #endif
 
 namespace {
 
 // The GpuCommandBufferMemoryTracker class provides a bridge between the
 // ContextGroup's memory type managers and the GpuMemoryManager class.
 class GpuCommandBufferMemoryTracker : public gpu::gles2::MemoryTracker {
  public:
-  GpuCommandBufferMemoryTracker(GpuMemoryManager* gpu_memory_manager)
-    : gpu_memory_manager_(gpu_memory_manager) {}
+  GpuCommandBufferMemoryTracker(GpuChannel* channel) {
+    gpu_memory_manager_tracking_group_ = new GpuMemoryTrackingGroup(
+      channel->renderer_pid(),

[greggman, 2012/08/10 01:23:26]

style: indent 4 spaces when splitting statement

[ccameron, 2012/08/10 18:13:38]

Done.

+      channel->gpu_channel_manager()->gpu_memory_manager());
+  }
+
   void TrackMemoryAllocatedChange(size_t old_size, size_t new_size) {
-    gpu_memory_manager_->TrackMemoryAllocatedChange(old_size, new_size);
+    gpu_memory_manager_tracking_group_->TrackMemoryAllocatedChange(
+      old_size, new_size);

[greggman, 2012/08/10 01:23:26]

style: indent 4 from previous line

[ccameron, 2012/08/10 18:13:38]

Done.

   }
 
  private:
-  ~GpuCommandBufferMemoryTracker() {}
-  GpuMemoryManager* gpu_memory_manager_;
+  ~GpuCommandBufferMemoryTracker() {
+    delete gpu_memory_manager_tracking_group_;
+  }
+  GpuMemoryTrackingGroup* gpu_memory_manager_tracking_group_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferMemoryTracker);
 };
 
 // FastSetActiveURL will shortcut the expensive call to SetActiveURL when the
 // url_hash matches.
 void FastSetActiveURL(const GURL& url, size_t url_hash) {
   // Leave the previously set URL in the empty case -- empty URLs are given by
   // WebKitPlatformSupportImpl::createOffscreenGraphicsContext3D. Hopefully the
   // onscreen context URL was set previously and will show up even when a crash
@@ skipping 56 matching lines @@
       delayed_work_scheduled_(false),
       active_url_(active_url) {
   active_url_hash_ =
       disk_cache::Hash(active_url.possibly_invalid_spec());
   FastSetActiveURL(active_url_, active_url_hash_);
   if (share_group) {
     context_group_ = share_group->context_group_;
   } else {
     context_group_ = new gpu::gles2::ContextGroup(
       mailbox_manager,
-      new GpuCommandBufferMemoryTracker(
-        channel->gpu_channel_manager()->gpu_memory_manager()),
+      new GpuCommandBufferMemoryTracker(channel),

[greggman, 2012/08/10 01:23:26]

style: indent 4 from first line of this group (previous line was wrong too)

[ccameron, 2012/08/10 18:13:38]

Done.

       true);
   }
   if (surface_id != 0)
     surface_state_.reset(new GpuCommandBufferStubBase::SurfaceState(
         surface_id, true, base::TimeTicks::Now()));
   if (handle_.sync_point)
     OnWaitSyncPoint(handle_.sync_point);
 }
 
 GpuCommandBufferStub::~GpuCommandBufferStub() {
@@ skipping 687 matching lines @@
     const GpuMemoryAllocation& allocation) {
   Send(new GpuCommandBufferMsg_SetMemoryAllocation(route_id_, allocation));
   // This can be called outside of OnMessageReceived, so the context needs to be
   // made current before calling methods on the surface.
   if (!surface_ || !MakeCurrent())
     return;
   surface_->SetFrontbufferAllocation(allocation.suggest_have_frontbuffer);
 }
 
 #endif  // defined(ENABLE_GPU)