Merge 73137 - 2010-12-02 Vincent Scheib <scheib@chromium.org>...

WebKit/chromium/public/WebKitClient.h

 /*
  * Copyright (C) 2010 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 192 matching lines @@
     // Profiling -----------------------------------------------------------
 
     virtual void decrementStatsCounter(const char* name) { }
     virtual void incrementStatsCounter(const char* name) { }
 
     // An event is identified by the pair (name, id).  The extra parameter
     // specifies additional data to log with the event.
     virtual void traceEventBegin(const char* name, void* id, const char* extra) { }
     virtual void traceEventEnd(const char* name, void* id, const char* extra) { }
 
-    // Generic callback for reporting histogram data. Range is identified by the min, max pair.
-    // By default, histogram is exponential, so that min=1, max=1000000, bucketCount=50 would do. Setting
-    // linear to true would require bucket count to cover whole min-max range.
-    virtual void histogramCounts(const WebString& name, int sample, int min, int max, int bucketCount, bool linear) { }
+    // Callbacks for reporting histogram data.
+    // CustomCounts histogram has exponential bucket sizes, so that min=1, max=1000000, bucketCount=50 would do.
+    virtual void histogramCustomCounts(const char* name, int sample, int min, int max, int bucketCount) { }
+    // Enumeration histogram buckets are linear, boundaryValue should be larger than any possible sample value.
+    virtual void histogramEnumeration(const char* name, int sample, int boundaryValue) { }
 
 
     // Resources -----------------------------------------------------------
 
     // Returns a blob of data corresponding to the named resource.
     virtual WebData loadResource(const char* name) { return WebData(); }
 
     // Decodes the in-memory audio file data and returns the linear PCM audio data in the destinationBus.
     // A sample-rate conversion to sampleRate will occur if the file data is at a different sample-rate.
     // Returns true on success.
@@ skipping 54 matching lines @@
     // Must return non-null.
     virtual WebFileSystem* fileSystem() { return 0; }
 
 protected:
     ~WebKitClient() { }
 };
 
 } // namespace WebKit
 
 #endif