Merge 143363

Source/WebCore/page/FeatureObserver.cpp

 /*
  * Copyright (C) 2012 Google, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 24 matching lines @@
 
 FeatureObserver::FeatureObserver()
 {
 }
 
 FeatureObserver::~FeatureObserver()
 {
     // We always log PageDestruction so that we have a scale for the rest of the features.
     HistogramSupport::histogramEnumeration("WebCore.FeatureObserver", PageDestruction, NumberOfFeatures);
 
+    updateMeasurements();
+}
+
+void FeatureObserver::updateMeasurements()
+{
+    HistogramSupport::histogramEnumeration("WebCore.FeatureObserver", PageVisits, NumberOfFeatures);
     if (!m_featureBits)
         return;
 
     for (unsigned i = 0; i < NumberOfFeatures; ++i) {
         if (m_featureBits->quickGet(i))
             HistogramSupport::histogramEnumeration("WebCore.FeatureObserver", i, NumberOfFeatures);
     }
+
+    m_featureBits->clearAll();
+}
+
+void FeatureObserver::didCommitLoad()
+{
+    updateMeasurements();
 }
 
 void FeatureObserver::observe(Document* document, Feature feature)
 {
     if (!document)
         return;
 
     Page* page = document->page();
     if (!page)
         return;
 
     page->featureObserver()->didObserve(feature);
 }
 
 void FeatureObserver::observe(DOMWindow* domWindow, Feature feature)
 {
     ASSERT(domWindow);
     observe(domWindow->document(), feature);
 }
 
 } // namespace WebCore