CL for perf tryjob on android

content/child/blink_platform_impl.cc

 // Copyright 2014 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 "content/child/blink_platform_impl.h"
 
 #include <math.h>
 
 #include <vector>
 
@@ skipping 568 matching lines @@
   DCHECK_LT(idx, web_events.size());
   return web_events[idx];
 }
 
 void BlinkPlatformImpl::decrementStatsCounter(const char* name) {
 }
 
 void BlinkPlatformImpl::incrementStatsCounter(const char* name) {
 }
 
-void BlinkPlatformImpl::histogramCustomCounts(
-    const char* name, int sample, int min, int max, int bucket_count) {
+void BlinkPlatformImpl::histogramCustomCounts(const char* name,
+                                              int sample,
+                                              int min,
+                                              int max,
+                                              int bucket_count,
+                                              HistogramCacheSlot* cache_slot) {
   // Copied from histogram macro, but without the static variable caching
   // the histogram because name is dynamic.
-  base::HistogramBase* counter =
-      base::Histogram::FactoryGet(name, min, max, bucket_count,
-          base::HistogramBase::kUmaTargetedHistogramFlag);
+  base::HistogramBase* counter = 0;
+  if (cache_slot)
+    counter = reinterpret_cast<base::HistogramBase*>(*cache_slot);
+
+  if (!counter) {
+    counter = base::Histogram::FactoryGet(
+        name, min, max, bucket_count,
+        base::HistogramBase::kUmaTargetedHistogramFlag);
+  }
   DCHECK_EQ(name, counter->histogram_name());
   counter->Add(sample);
+  if (cache_slot)
+    *cache_slot = counter;
 }
 
-void BlinkPlatformImpl::histogramEnumeration(
-    const char* name, int sample, int boundary_value) {
+void BlinkPlatformImpl::histogramEnumeration(const char* name,
+                                             int sample,
+                                             int boundary_value,
+                                             HistogramCacheSlot* cache_slot) {
   // Copied from histogram macro, but without the static variable caching
   // the histogram because name is dynamic.
-  base::HistogramBase* counter =
-      base::LinearHistogram::FactoryGet(name, 1, boundary_value,
-          boundary_value + 1, base::HistogramBase::kUmaTargetedHistogramFlag);
+  base::HistogramBase* counter = 0;
+  if (cache_slot)
+    counter = reinterpret_cast<base::HistogramBase*>(*cache_slot);
+
+  if (!counter) {
+    counter = base::LinearHistogram::FactoryGet(
+        name, 1, boundary_value, boundary_value + 1,
+        base::HistogramBase::kUmaTargetedHistogramFlag);
+  }
   DCHECK_EQ(name, counter->histogram_name());
   counter->Add(sample);
+  if (cache_slot)
+    *cache_slot = counter;
 }
 
-void BlinkPlatformImpl::histogramSparse(const char* name, int sample) {
+void BlinkPlatformImpl::histogramSparse(const char* name,
+                                        int sample,
+                                        HistogramCacheSlot* cache_slot) {
   // For sparse histograms, we can use the macro, as it does not incorporate a
   // static.
   UMA_HISTOGRAM_SPARSE_SLOWLY(name, sample);
 }
 
 void BlinkPlatformImpl::registerMemoryDumpProvider(
     blink::WebMemoryDumpProvider* wmdp, const char* name) {
   WebMemoryDumpProviderAdapter* wmdp_adapter =
       new WebMemoryDumpProviderAdapter(wmdp);
   bool did_insert =
@@ skipping 589 matching lines @@
   return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString(
       static_cast<ui::DomKey>(dom_key)));
 }
 
 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) {
   return static_cast<int>(
       ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8()));
 }
 
 }  // namespace content