Add a histogram for renderer memory usage.

content/renderer/renderer_main.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.
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/debug/stack_trace.h"
 #include "base/debug/trace_event.h"
 #include "base/hi_res_timer_manager.h"
@@ skipping 11 matching lines @@
 #include "base/threading/platform_thread.h"
 #include "base/time.h"
 #include "content/common/pepper_plugin_registry.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/renderer/browser_plugin/browser_plugin_manager_impl.h"
 #include "content/renderer/render_process_impl.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/renderer_main_platform_delegate.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"
 #include "ui/base/ui_base_switches.h"
 #include "webkit/plugins/ppapi/ppapi_interface_factory.h"
 
 #if defined(OS_MACOSX)
 #include <Carbon/Carbon.h>
 #include <signal.h>
 #include <unistd.h>
 
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "third_party/mach_override/mach_override.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #endif  // OS_MACOSX
 
+using WebKit::Platform;
+
 namespace content {
 
 namespace {
 
 #if defined(OS_MACOSX)
 
 CFArrayRef ChromeTISCreateInputSourceList(
    CFDictionaryRef properties,
    Boolean includeAllInstalled) {
   CFTypeRef values[] = { CFSTR("") };
@@ skipping 46 matching lines @@
 // This is a simplified version of the browser Jankometer, which measures
 // the processing time of tasks on the render thread.
 class RendererMessageLoopObserver : public MessageLoop::TaskObserver {
  public:
   RendererMessageLoopObserver()
       : process_times_(base::Histogram::FactoryGet(
             "Chrome.ProcMsgL RenderThread",
             1, 3600000, 50, base::Histogram::kUmaTargetedHistogramFlag)) {}
   virtual ~RendererMessageLoopObserver() {}
 
-  virtual void WillProcessTask(base::TimeTicks time_posted) {
+  virtual void WillProcessTask(base::TimeTicks time_posted) OVERRIDE {
     begin_process_message_ = base::TimeTicks::Now();
   }
 
-  virtual void DidProcessTask(base::TimeTicks time_posted) {
+  virtual void DidProcessTask(base::TimeTicks time_posted) OVERRIDE {
     if (!begin_process_message_.is_null())
       process_times_->AddTime(base::TimeTicks::Now() - begin_process_message_);
+    if (Platform::current()) {
+      RenderThreadImpl* render_thread = RenderThreadImpl::current();
+      render_thread->histogram_customizer()->memory_renderer_used()->Add(
+          Platform::current()->memoryUsageMB() * 1024);
+    }
   }
 
  private:
   base::TimeTicks begin_process_message_;
   base::Histogram* const process_times_;
   DISALLOW_COPY_AND_ASSIGN(RendererMessageLoopObserver);
 };
 
 // mainline routine for running as the Renderer process
 int RendererMain(const MainFunctionParams& parameters) {
@@ skipping 112 matching lines @@
       MessageLoop::current()->Run();
       TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0);
     }
   }
   platform.PlatformUninitialize();
   TRACE_EVENT_END_ETW("RendererMain", 0, "");
   return 0;
 }
 
 }  // namespace content