Histograms - Support histograms for Plugins, GPU

chrome/renderer/page_load_histograms.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 "chrome/renderer/page_load_histograms.h"
 
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
-#include "chrome/common/chrome_constants.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/renderer/chrome_content_renderer_client.h"
 #include "chrome/renderer/prerender/prerender_helper.h"
-#include "chrome/renderer/renderer_histogram_snapshots.h"
+#include "content/public/common/content_constants.h"
 #include "content/public/renderer/document_state.h"
+#include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPerformance.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 
 using WebKit::WebDataSource;
 using WebKit::WebFrame;
@@ skipping 84 matching lines @@
 enum AbandonType {
   FINISH_DOC_MISSING = 0x1,
   FINISH_ALL_LOADS_MISSING = 0x2,
   LOAD_EVENT_START_MISSING = 0x4,
   LOAD_EVENT_END_MISSING = 0x8,
   ABANDON_TYPE_MAX = 0x10
 };
 
 }  // namespace
 
-PageLoadHistograms::PageLoadHistograms(
-    content::RenderView* render_view,
-    RendererHistogramSnapshots* histogram_snapshots)
+PageLoadHistograms::PageLoadHistograms(content::RenderView* render_view)
     : content::RenderViewObserver(render_view),
       cross_origin_access_count_(0),
-      same_origin_access_count_(0),
-      histogram_snapshots_(histogram_snapshots) {
+      same_origin_access_count_(0) {
 }
 
 void PageLoadHistograms::Dump(WebFrame* frame) {
   // We only dump histograms for main frames.
   // In the future, it may be interesting to tag subframes and dump them too.
   if (!frame || frame->parent())
     return;
 
   // Only dump for supported schemes.
   URLPattern::SchemeMasks scheme_type =
@@ skipping 797 matching lines @@
                                                begin_to_finish_all_loads);
 
   // Since there are currently no guarantees that renderer histograms will be
   // sent to the browser, we initiate a PostTask here to be sure that we send
   // the histograms we generated.  Without this call, pages that don't have an
   // on-close-handler might generate data that is lost when the renderer is
   // shutdown abruptly (perchance because the user closed the tab).
   // TODO(jar) BUG=33233: This needs to be moved to a PostDelayedTask, and it
   // should post when the onload is complete, so that it doesn't interfere with
   // the next load.
-  histogram_snapshots_->SendHistograms(
-      chrome::kHistogramSynchronizerReservedSequenceNumber);
+  content::RenderThread::Get()->UpdateHistograms(

[jar (doing other things), 2012/07/09 23:04:12]

IF GPU goes away... we'll lose data.  Do we want to expedite uploads
periodically (for instance)?

Should we add a TODO and a bug?

[ramant (doing other things), 2012/07/11 23:52:54]

Created issue 136892.
Done.

+      content::kHistogramSynchronizerReservedSequenceNumber);
 }
 
 void PageLoadHistograms::ResetCrossFramePropertyAccess() {
   cross_origin_access_count_ = 0;
   same_origin_access_count_ = 0;
 }
 
 void PageLoadHistograms::FrameWillClose(WebFrame* frame) {
   Dump(frame);
 }
@@ skipping 15 matching lines @@
 
   DCHECK(document_state);
   DCHECK(ds);
   GURL url(ds->request().url());
   Time start = document_state->start_load_time();
   Time finish = document_state->finish_load_time();
   // TODO(mbelshe): should we log more stats?
   VLOG(1) << "PLT: " << (finish - start).InMilliseconds() << "ms "
           << url.spec();
 }