Remove HistogramSupport.
authorakling@apple.com <akling@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 May 2014 23:57:54 +0000 (23:57 +0000)
committerakling@apple.com <akling@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 May 2014 23:57:54 +0000 (23:57 +0000)
<https://webkit.org/b/132354>

Prune some leftover Chromium gunk that no other ports ever used.

Reviewed by Simon Fraser.

* CMakeLists.txt:
* Modules/indexeddb/IDBDatabase.cpp:
(WebCore::IDBDatabase::createObjectStore):
(WebCore::IDBDatabase::deleteObjectStore):
(WebCore::IDBDatabase::transaction):
* Modules/indexeddb/IDBFactory.cpp:
(WebCore::IDBFactory::openInternal):
(WebCore::IDBFactory::deleteDatabase):
* Modules/indexeddb/IDBHistograms.h: Removed.
* Modules/indexeddb/leveldb/IDBBackingStoreLevelDB.cpp:
(WebCore::IDBBackingStoreLevelDB::open):
(WebCore::IDBBackingStoreLevelDB::openInMemory):
(WebCore::recordInternalError): Deleted.
* Modules/indexeddb/leveldb/IDBBackingStoreTransactionLevelDB.cpp:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* css/CSSParser.cpp:
(WebCore::cssPropertyID):
* dom/Document.cpp:
(WebCore::Document::~Document):
(WebCore::histogramMutationEventUsage): Deleted.
* dom/ShadowRoot.cpp:
* fileapi/Blob.cpp:
* fileapi/WebKitBlobBuilder.cpp:
(WebCore::BlobBuilder::append):
* history/PageCache.cpp:
(WebCore::logCanCacheFrameDecision):
(WebCore::logCanCachePageDecision):
* platform/HistogramSupport.cpp: Removed.
* platform/HistogramSupport.h: Removed.
* platform/leveldb/LevelDBDatabase.cpp:
(WebCore::LevelDBDatabase::open):
(WebCore::histogramLevelDBError): Deleted.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::updateNeedsCompositedScrolling):
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::send):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@168209 268f45cc-cd09-0410-ab3c-d52691b4dbfc

21 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/Modules/indexeddb/IDBDatabase.cpp
Source/WebCore/Modules/indexeddb/IDBFactory.cpp
Source/WebCore/Modules/indexeddb/IDBHistograms.h [deleted file]
Source/WebCore/Modules/indexeddb/leveldb/IDBBackingStoreLevelDB.cpp
Source/WebCore/Modules/indexeddb/leveldb/IDBBackingStoreTransactionLevelDB.cpp
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/css/CSSParser.cpp
Source/WebCore/dom/Document.cpp
Source/WebCore/dom/ShadowRoot.cpp
Source/WebCore/fileapi/Blob.cpp
Source/WebCore/fileapi/WebKitBlobBuilder.cpp
Source/WebCore/history/PageCache.cpp
Source/WebCore/platform/HistogramSupport.cpp [deleted file]
Source/WebCore/platform/HistogramSupport.h [deleted file]
Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
Source/WebCore/rendering/RenderLayer.cpp
Source/WebCore/xml/XMLHttpRequest.cpp

index 1ff11ef..a84eb9c 100644 (file)
@@ -1952,7 +1952,6 @@ set(WebCore_SOURCES
     platform/FileChooser.cpp
     platform/FileStream.cpp
     platform/FileSystem.cpp
-    platform/HistogramSupport.cpp
     platform/URL.cpp
     platform/KillRingNone.cpp
     platform/Language.cpp
index 38d2830..c1987d8 100644 (file)
@@ -1,3 +1,51 @@
+2014-05-02  Andreas Kling  <akling@apple.com>
+
+        Remove HistogramSupport.
+        <https://webkit.org/b/132354>
+
+        Prune some leftover Chromium gunk that no other ports ever used.
+
+        Reviewed by Simon Fraser.
+
+        * CMakeLists.txt:
+        * Modules/indexeddb/IDBDatabase.cpp:
+        (WebCore::IDBDatabase::createObjectStore):
+        (WebCore::IDBDatabase::deleteObjectStore):
+        (WebCore::IDBDatabase::transaction):
+        * Modules/indexeddb/IDBFactory.cpp:
+        (WebCore::IDBFactory::openInternal):
+        (WebCore::IDBFactory::deleteDatabase):
+        * Modules/indexeddb/IDBHistograms.h: Removed.
+        * Modules/indexeddb/leveldb/IDBBackingStoreLevelDB.cpp:
+        (WebCore::IDBBackingStoreLevelDB::open):
+        (WebCore::IDBBackingStoreLevelDB::openInMemory):
+        (WebCore::recordInternalError): Deleted.
+        * Modules/indexeddb/leveldb/IDBBackingStoreTransactionLevelDB.cpp:
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * WebCore.xcodeproj/project.pbxproj:
+        * css/CSSParser.cpp:
+        (WebCore::cssPropertyID):
+        * dom/Document.cpp:
+        (WebCore::Document::~Document):
+        (WebCore::histogramMutationEventUsage): Deleted.
+        * dom/ShadowRoot.cpp:
+        * fileapi/Blob.cpp:
+        * fileapi/WebKitBlobBuilder.cpp:
+        (WebCore::BlobBuilder::append):
+        * history/PageCache.cpp:
+        (WebCore::logCanCacheFrameDecision):
+        (WebCore::logCanCachePageDecision):
+        * platform/HistogramSupport.cpp: Removed.
+        * platform/HistogramSupport.h: Removed.
+        * platform/leveldb/LevelDBDatabase.cpp:
+        (WebCore::LevelDBDatabase::open):
+        (WebCore::histogramLevelDBError): Deleted.
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::updateNeedsCompositedScrolling):
+        * xml/XMLHttpRequest.cpp:
+        (WebCore::XMLHttpRequest::send):
+
 2014-05-02  Brady Eidson  <beidson@apple.com>
 
         Stop flipping the ImageControlsButton
index 78f880c..6100912 100644 (file)
 #include "DOMStringList.h"
 #include "EventQueue.h"
 #include "ExceptionCode.h"
-#include "HistogramSupport.h"
 #include "IDBAny.h"
 #include "IDBDatabaseCallbacks.h"
 #include "IDBDatabaseError.h"
 #include "IDBDatabaseException.h"
 #include "IDBEventDispatcher.h"
-#include "IDBHistograms.h"
 #include "IDBIndex.h"
 #include "IDBKeyPath.h"
 #include "IDBObjectStore.h"
@@ -161,7 +159,6 @@ PassRefPtr<IDBObjectStore> IDBDatabase::createObjectStore(const String& name, co
 PassRefPtr<IDBObjectStore> IDBDatabase::createObjectStore(const String& name, const IDBKeyPath& keyPath, bool autoIncrement, ExceptionCode& ec)
 {
     LOG(StorageAPI, "IDBDatabase::createObjectStore");
-    HistogramSupport::histogramEnumeration("WebCore.IndexedDB.FrontEndAPICalls", IDBCreateObjectStoreCall, IDBMethodsMax);
     if (!m_versionChangeTransaction) {
         ec = IDBDatabaseException::InvalidStateError;
         return 0;
@@ -201,7 +198,6 @@ PassRefPtr<IDBObjectStore> IDBDatabase::createObjectStore(const String& name, co
 void IDBDatabase::deleteObjectStore(const String& name, ExceptionCode& ec)
 {
     LOG(StorageAPI, "IDBDatabase::deleteObjectStore");
-    HistogramSupport::histogramEnumeration("WebCore.IndexedDB.FrontEndAPICalls", IDBDeleteObjectStoreCall, IDBMethodsMax);
     if (!m_versionChangeTransaction) {
         ec = IDBDatabaseException::InvalidStateError;
         return;
@@ -225,7 +221,6 @@ void IDBDatabase::deleteObjectStore(const String& name, ExceptionCode& ec)
 PassRefPtr<IDBTransaction> IDBDatabase::transaction(ScriptExecutionContext* context, const Vector<String>& scope, const String& modeString, ExceptionCode& ec)
 {
     LOG(StorageAPI, "IDBDatabase::transaction");
-    HistogramSupport::histogramEnumeration("WebCore.IndexedDB.FrontEndAPICalls", IDBTransactionCall, IDBMethodsMax);
     if (!scope.size()) {
         ec = IDBDatabaseException::InvalidAccessError;
         return 0;
index 6b91974..668d88a 100644 (file)
 #include "ExceptionCode.h"
 #include "Frame.h"
 #include "GroupSettings.h"
-#include "HistogramSupport.h"
 #include "IDBBindingUtilities.h"
 #include "IDBDatabase.h"
 #include "IDBDatabaseCallbacksImpl.h"
 #include "IDBDatabaseException.h"
 #include "IDBFactoryBackendInterface.h"
-#include "IDBHistograms.h"
 #include "IDBKey.h"
 #include "IDBKeyRange.h"
 #include "IDBOpenDBRequest.h"
@@ -124,7 +122,6 @@ PassRefPtr<IDBOpenDBRequest> IDBFactory::open(ScriptExecutionContext* context, c
 
 PassRefPtr<IDBOpenDBRequest> IDBFactory::openInternal(ScriptExecutionContext* context, const String& name, uint64_t version, IndexedDB::VersionNullness versionNullness, ExceptionCode& ec)
 {
-    HistogramSupport::histogramEnumeration("WebCore.IndexedDB.FrontEndAPICalls", IDBOpenCall, IDBMethodsMax);
     ASSERT(version >= 1 || versionNullness == IndexedDB::VersionNullness::Null);
     if (name.isNull()) {
         ec = TypeError;
@@ -147,7 +144,6 @@ PassRefPtr<IDBOpenDBRequest> IDBFactory::openInternal(ScriptExecutionContext* co
 PassRefPtr<IDBOpenDBRequest> IDBFactory::deleteDatabase(ScriptExecutionContext* context, const String& name, ExceptionCode& ec)
 {
     LOG(StorageAPI, "IDBFactory::deleteDatabase");
-    HistogramSupport::histogramEnumeration("WebCore.IndexedDB.FrontEndAPICalls", IDBDeleteDatabaseCall, IDBMethodsMax);
     if (name.isNull()) {
         ec = TypeError;
         return 0;
diff --git a/Source/WebCore/Modules/indexeddb/IDBHistograms.h b/Source/WebCore/Modules/indexeddb/IDBHistograms.h
deleted file mode 100644 (file)
index 1ff2a35..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2013 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
- *     documentation and/or other materials provided with the distribution.
- * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY GOOGLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef IDBHistograms_h
-#define IDBHistograms_h
-
-namespace WebCore {
-
-enum IndexedDatabaseMethods {
-    IDBCreateObjectStoreCall,
-    IDBDeleteObjectStoreCall,
-    IDBTransactionCall,
-    IDBDeleteDatabaseCall,
-    IDBOpenCall,
-    IDBMethodsMax,
-};
-
-}
-
-#endif
index 318ae8b..5e0010e 100644 (file)
@@ -29,7 +29,6 @@
 #if ENABLE(INDEXED_DATABASE) && USE(LEVELDB)
 
 #include "FileSystem.h"
-#include "HistogramSupport.h"
 #include "IDBDatabaseMetadata.h"
 #include "IDBIndexWriterLevelDB.h"
 #include "IDBKey.h"
@@ -77,19 +76,12 @@ enum IDBBackingStoreLevelDBErrorSource {
     IDBLevelDBBackingStoreInternalErrorMax,
 };
 
-static void recordInternalError(const char* type, IDBBackingStoreLevelDBErrorSource location)
-{
-    String name = String::format("WebCore.IndexedDB.BackingStore.%sError", type);
-    HistogramSupport::histogramEnumeration(name.utf8().data(), location, IDBLevelDBBackingStoreInternalErrorMax);
-}
-
 // Use to signal conditions that usually indicate developer error, but could be caused by data corruption.
 // A macro is used instead of an inline function so that the assert and log report the line number.
 #define REPORT_ERROR(type, location) \
     do { \
         LOG_ERROR("IndexedDB %s Error: %s", type, #location); \
         ASSERT_NOT_REACHED(); \
-        recordInternalError(type, location); \
     } while (0)
 
 #define INTERNAL_READ_ERROR(location) REPORT_ERROR("Read", location)
@@ -351,21 +343,6 @@ IDBBackingStoreLevelDB::~IDBBackingStoreLevelDB()
     m_comparator = nullptr;
 }
 
-enum IDBLevelDBBackingStoreOpenResult {
-    IDBLevelDBBackingStoreOpenMemorySuccess,
-    IDBLevelDBBackingStoreOpenSuccess,
-    IDBLevelDBBackingStoreOpenFailedDirectory,
-    IDBLevelDBBackingStoreOpenFailedUnknownSchema,
-    IDBLevelDBBackingStoreOpenCleanupDestroyFailed,
-    IDBLevelDBBackingStoreOpenCleanupReopenFailed,
-    IDBLevelDBBackingStoreOpenCleanupReopenSuccess,
-    IDBLevelDBBackingStoreOpenFailedIOErrCheckingSchema,
-    IDBLevelDBBackingStoreOpenFailedUnknownErr,
-    IDBLevelDBBackingStoreOpenMemoryFailed,
-    IDBLevelDBBackingStoreOpenAttemptNonASCII,
-    IDBLevelDBBackingStoreOpenMax,
-};
-
 PassRefPtr<IDBBackingStoreLevelDB> IDBBackingStoreLevelDB::open(const SecurityOrigin& securityOrigin, const String& pathBaseArg, const String& fileIdentifier)
 {
     DefaultLevelDBFactory levelDBFactory;
@@ -381,11 +358,8 @@ PassRefPtr<IDBBackingStoreLevelDB> IDBBackingStoreLevelDB::open(const SecurityOr
     std::unique_ptr<LevelDBComparator> comparator = std::make_unique<Comparator>();
     std::unique_ptr<LevelDBDatabase> db;
 
-    if (!pathBase.containsOnlyASCII())
-            HistogramSupport::histogramEnumeration("WebCore.IndexedDB.BackingStore.OpenStatus", IDBLevelDBBackingStoreOpenAttemptNonASCII, IDBLevelDBBackingStoreOpenMax);
     if (!makeAllDirectories(pathBase)) {
         LOG_ERROR("Unable to create IndexedDB database path %s", pathBase.utf8().data());
-        HistogramSupport::histogramEnumeration("WebCore.IndexedDB.BackingStore.OpenStatus", IDBLevelDBBackingStoreOpenFailedDirectory, IDBLevelDBBackingStoreOpenMax);
         return PassRefPtr<IDBBackingStoreLevelDB>();
     }
 
@@ -397,23 +371,18 @@ PassRefPtr<IDBBackingStoreLevelDB> IDBBackingStoreLevelDB::open(const SecurityOr
         bool ok = isSchemaKnown(db.get(), known);
         if (!ok) {
             LOG_ERROR("IndexedDB had IO error checking schema, treating it as failure to open");
-            HistogramSupport::histogramEnumeration("WebCore.IndexedDB.BackingStore.OpenStatus", IDBLevelDBBackingStoreOpenFailedIOErrCheckingSchema, IDBLevelDBBackingStoreOpenMax);
             db = nullptr;
         } else if (!known) {
             LOG_ERROR("IndexedDB backing store had unknown schema, treating it as failure to open");
-            HistogramSupport::histogramEnumeration("WebCore.IndexedDB.BackingStore.OpenStatus", IDBLevelDBBackingStoreOpenFailedUnknownSchema, IDBLevelDBBackingStoreOpenMax);
             db = nullptr;
         }
     }
 
-    if (db)
-        HistogramSupport::histogramEnumeration("WebCore.IndexedDB.BackingStore.OpenStatus", IDBLevelDBBackingStoreOpenSuccess, IDBLevelDBBackingStoreOpenMax);
-    else {
+    if (!db) {
         LOG_ERROR("IndexedDB backing store open failed, attempting cleanup");
         bool success = levelDBFactory->destroyLevelDB(path);
         if (!success) {
             LOG_ERROR("IndexedDB backing store cleanup failed");
-            HistogramSupport::histogramEnumeration("WebCore.IndexedDB.BackingStore.OpenStatus", IDBLevelDBBackingStoreOpenCleanupDestroyFailed, IDBLevelDBBackingStoreOpenMax);
             return PassRefPtr<IDBBackingStoreLevelDB>();
         }
 
@@ -421,15 +390,12 @@ PassRefPtr<IDBBackingStoreLevelDB> IDBBackingStoreLevelDB::open(const SecurityOr
         db = levelDBFactory->openLevelDB(path, comparator.get());
         if (!db) {
             LOG_ERROR("IndexedDB backing store reopen after recovery failed");
-            HistogramSupport::histogramEnumeration("WebCore.IndexedDB.BackingStore.OpenStatus", IDBLevelDBBackingStoreOpenCleanupReopenFailed, IDBLevelDBBackingStoreOpenMax);
             return PassRefPtr<IDBBackingStoreLevelDB>();
         }
-        HistogramSupport::histogramEnumeration("WebCore.IndexedDB.BackingStore.OpenStatus", IDBLevelDBBackingStoreOpenCleanupReopenSuccess, IDBLevelDBBackingStoreOpenMax);
     }
 
     if (!db) {
         ASSERT_NOT_REACHED();
-        HistogramSupport::histogramEnumeration("WebCore.IndexedDB.BackingStore.OpenStatus", IDBLevelDBBackingStoreOpenFailedUnknownErr, IDBLevelDBBackingStoreOpenMax);
         return PassRefPtr<IDBBackingStoreLevelDB>();
     }
 
@@ -450,10 +416,8 @@ PassRefPtr<IDBBackingStoreLevelDB> IDBBackingStoreLevelDB::openInMemory(const St
     std::unique_ptr<LevelDBDatabase> db = LevelDBDatabase::openInMemory(comparator.get());
     if (!db) {
         LOG_ERROR("LevelDBDatabase::openInMemory failed.");
-        HistogramSupport::histogramEnumeration("WebCore.IndexedDB.BackingStore.OpenStatus", IDBLevelDBBackingStoreOpenMemoryFailed, IDBLevelDBBackingStoreOpenMax);
         return PassRefPtr<IDBBackingStoreLevelDB>();
     }
-    HistogramSupport::histogramEnumeration("WebCore.IndexedDB.BackingStore.OpenStatus", IDBLevelDBBackingStoreOpenMemorySuccess, IDBLevelDBBackingStoreOpenMax);
 
     return create(identifier, std::move(db), std::move(comparator));
 }
index a7a5f66..bedbb4c 100644 (file)
@@ -28,7 +28,6 @@
 
 #if ENABLE(INDEXED_DATABASE) && USE(LEVELDB)
 
-#include "HistogramSupport.h"
 #include "IDBBackingStoreLevelDB.h"
 #include "Logging.h"
 #include <wtf/text/CString.h>
index 79c8731..752cb49 100644 (file)
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\platform\HistogramSupport.cpp" />
     <ClCompile Include="..\platform\graphics\win\MediaPlayerPrivateMediaFoundation.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     <ClInclude Include="..\platform\graphics\VideoTrackPrivate.h" />
     <ClInclude Include="..\platform\graphics\win\MediaPlayerPrivateMediaFoundation.h" />
     <ClInclude Include="..\platform\graphics\win\SharedGDIObject.h" />
-    <ClInclude Include="..\platform\HistogramSupport.h" />
     <ClInclude Include="..\platform\HostWindow.h" />
     <ClInclude Include="..\platform\KeypressCommand.h" />
     <ClInclude Include="..\platform\KillRing.h" />
index d2fabae..f7f78bf 100644 (file)
     <ClCompile Include="..\platform\FileSystem.cpp">
       <Filter>platform</Filter>
     </ClCompile>
-    <ClCompile Include="..\platform\HistogramSupport.cpp">
-      <Filter>platform</Filter>
-    </ClCompile>
     <ClCompile Include="..\platform\KillRingNone.cpp">
       <Filter>platform</Filter>
     </ClCompile>
     <ClInclude Include="..\platform\FloatConversion.h">
       <Filter>platform</Filter>
     </ClInclude>
-    <ClInclude Include="..\platform\HistogramSupport.h">
-      <Filter>platform</Filter>
-    </ClInclude>
     <ClInclude Include="..\platform\HostWindow.h">
       <Filter>platform</Filter>
     </ClInclude>
index 3814e78..6d35040 100644 (file)
                51D719D3181106E00016DC51 /* IDBFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D71989181106DF0016DC51 /* IDBFactory.h */; };
                51D719D5181106E00016DC51 /* IDBFactoryBackendInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51D7198B181106DF0016DC51 /* IDBFactoryBackendInterface.cpp */; };
                51D719D6181106E00016DC51 /* IDBFactoryBackendInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D7198C181106E00016DC51 /* IDBFactoryBackendInterface.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               51D719D7181106E00016DC51 /* IDBHistograms.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D7198D181106E00016DC51 /* IDBHistograms.h */; };
                51D719D8181106E00016DC51 /* IDBIndex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51D7198E181106E00016DC51 /* IDBIndex.cpp */; };
                51D719D9181106E00016DC51 /* IDBIndex.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D7198F181106E00016DC51 /* IDBIndex.h */; };
                51D719DB181106E00016DC51 /* IDBKey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51D71991181106E00016DC51 /* IDBKey.cpp */; };
                D6E528A3149A926D00EFE1F3 /* MutationObserverInterestGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6E528A1149A926D00EFE1F3 /* MutationObserverInterestGroup.cpp */; };
                D6E528A4149A926D00EFE1F3 /* MutationObserverInterestGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = D6E528A2149A926D00EFE1F3 /* MutationObserverInterestGroup.h */; };
                D6F7960D166FFECE0076DD18 /* JSHTMLTemplateElementCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6F7960C166FFECE0076DD18 /* JSHTMLTemplateElementCustom.cpp */; };
-               D6FDAEF3149C06190037B1E1 /* HistogramSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6FDAEF2149C06190037B1E1 /* HistogramSupport.cpp */; };
                D70AD65713E1342B005B50B4 /* RenderRegion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D70AD65513E1342B005B50B4 /* RenderRegion.cpp */; };
                D70AD65813E1342B005B50B4 /* RenderRegion.h in Headers */ = {isa = PBXBuildFile; fileRef = D70AD65613E1342B005B50B4 /* RenderRegion.h */; };
                D72F6D79153159A3001EE44E /* FlowThreadController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D72F6D77153159A3001EE44E /* FlowThreadController.cpp */; };
                51D7198A181106DF0016DC51 /* IDBFactory.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IDBFactory.idl; sourceTree = "<group>"; };
                51D7198B181106DF0016DC51 /* IDBFactoryBackendInterface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBFactoryBackendInterface.cpp; sourceTree = "<group>"; };
                51D7198C181106E00016DC51 /* IDBFactoryBackendInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBFactoryBackendInterface.h; sourceTree = "<group>"; };
-               51D7198D181106E00016DC51 /* IDBHistograms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBHistograms.h; sourceTree = "<group>"; };
                51D7198E181106E00016DC51 /* IDBIndex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBIndex.cpp; sourceTree = "<group>"; };
                51D7198F181106E00016DC51 /* IDBIndex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBIndex.h; sourceTree = "<group>"; };
                51D71990181106E00016DC51 /* IDBIndex.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IDBIndex.idl; sourceTree = "<group>"; };
                D3D4E971130C7CFE007BA540 /* HTMLSummaryElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLSummaryElement.h; sourceTree = "<group>"; };
                D619A305144E00BE004BC302 /* ChildListMutationScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChildListMutationScope.cpp; sourceTree = "<group>"; };
                D619A306144E00BE004BC302 /* ChildListMutationScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChildListMutationScope.h; sourceTree = "<group>"; };
-               D630E2AB149BF344005B2F93 /* HistogramSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistogramSupport.h; sourceTree = "<group>"; };
                D6489D23166FFCF1007C031B /* JSHTMLTemplateElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLTemplateElement.cpp; sourceTree = "<group>"; };
                D6489D24166FFCF1007C031B /* JSHTMLTemplateElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLTemplateElement.h; sourceTree = "<group>"; };
                D66B2D5B186830050073C4DD /* PlatformCAFiltersMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlatformCAFiltersMac.h; path = ca/mac/PlatformCAFiltersMac.h; sourceTree = "<group>"; };
                D6EFC0BC1666DF7A003D291E /* HTMLTemplateElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLTemplateElement.h; sourceTree = "<group>"; };
                D6EFC0BD1666DF7A003D291E /* HTMLTemplateElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLTemplateElement.idl; sourceTree = "<group>"; };
                D6F7960C166FFECE0076DD18 /* JSHTMLTemplateElementCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLTemplateElementCustom.cpp; sourceTree = "<group>"; };
-               D6FDAEF2149C06190037B1E1 /* HistogramSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HistogramSupport.cpp; sourceTree = "<group>"; };
                D70AD65513E1342B005B50B4 /* RenderRegion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderRegion.cpp; sourceTree = "<group>"; };
                D70AD65613E1342B005B50B4 /* RenderRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderRegion.h; sourceTree = "<group>"; };
                D72F6D77153159A3001EE44E /* FlowThreadController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FlowThreadController.cpp; sourceTree = "<group>"; };
                                51D7198B181106DF0016DC51 /* IDBFactoryBackendInterface.cpp */,
                                51D7198C181106E00016DC51 /* IDBFactoryBackendInterface.h */,
                                5123AF1C18918AE40031CDC9 /* IDBGetResult.h */,
-                               51D7198D181106E00016DC51 /* IDBHistograms.h */,
                                51D7198E181106E00016DC51 /* IDBIndex.cpp */,
                                51D7198F181106E00016DC51 /* IDBIndex.h */,
                                51D71990181106E00016DC51 /* IDBIndex.idl */,
                                514B3F720C722047000530DF /* FileSystem.h */,
                                BC073BA90C399B1F000F5979 /* FloatConversion.h */,
                                A8748BDF12CBF2DC001FBA41 /* HashTools.h */,
-                               D6FDAEF2149C06190037B1E1 /* HistogramSupport.cpp */,
-                               D630E2AB149BF344005B2F93 /* HistogramSupport.h */,
                                BC3BC29B0E91AB0F00835588 /* HostWindow.h */,
                                862F129F18C1DCE4005C54AF /* HysteresisActivity.h */,
                                E15FF7D418C9553800FE4C87 /* KeypressCommand.h */,
                                51D719D6181106E00016DC51 /* IDBFactoryBackendInterface.h in Headers */,
                                51660AB91828BB8200074CAD /* IDBFactoryBackendLevelDB.h in Headers */,
                                5123AF1D18918AE40031CDC9 /* IDBGetResult.h in Headers */,
-                               51D719D7181106E00016DC51 /* IDBHistograms.h in Headers */,
                                51D719D9181106E00016DC51 /* IDBIndex.h in Headers */,
                                51ABB5B8186D0ED1008391A1 /* IDBIndexMetadata.h in Headers */,
                                510194411836D20800925523 /* IDBIndexWriterLevelDB.h in Headers */,
                                B2A015AA0AF6CD53006BCE0E /* GraphicsTypes.cpp in Sources */,
                                C50B561612119D23008B46E0 /* GroupSettings.cpp in Sources */,
                                F55B3DBF1251F12D003EF269 /* HiddenInputType.cpp in Sources */,
-                               D6FDAEF3149C06190037B1E1 /* HistogramSupport.cpp in Sources */,
                                BC94D1530C275C8B006BC617 /* History.cpp in Sources */,
                                97DCE20110807C750057D394 /* HistoryController.cpp in Sources */,
                                51741D120B07259A00ED442C /* HistoryItem.cpp in Sources */,
index 5a90add..443e408 100644 (file)
@@ -62,7 +62,6 @@
 #include "FloatConversion.h"
 #include "HTMLParserIdioms.h"
 #include "HashTools.h"
-#include "HistogramSupport.h"
 #include "MediaList.h"
 #include "MediaQueryExp.h"
 #include "Page.h"
@@ -11942,16 +11941,7 @@ static CSSPropertyID cssPropertyID(const CharacterType* propertyName, unsigned l
     }
 
     const Property* hashTableEntry = findProperty(name, length);
-    const CSSPropertyID propertyID = hashTableEntry ? static_cast<CSSPropertyID>(hashTableEntry->id) : CSSPropertyInvalid;
-
-    static const int cssPropertyHistogramSize = numCSSProperties;
-    if (hasPrefix(buffer, length, "-webkit-") && propertyID != CSSPropertyInvalid) {
-        int histogramValue = propertyID - firstCSSProperty;
-        ASSERT(0 <= histogramValue && histogramValue < cssPropertyHistogramSize);
-        HistogramSupport::histogramEnumeration("CSS.PrefixUsage", histogramValue, cssPropertyHistogramSize);
-    }
-
-    return propertyID;
+    return hashTableEntry ? static_cast<CSSPropertyID>(hashTableEntry->id) : CSSPropertyInvalid;
 }
 
 CSSPropertyID cssPropertyID(const String& string)
index e699c08..809a880 100644 (file)
@@ -85,7 +85,6 @@
 #include "HTMLTitleElement.h"
 #include "HTTPParsers.h"
 #include "HashChangeEvent.h"
-#include "HistogramSupport.h"
 #include "History.h"
 #include "HitTestResult.h"
 #include "IconController.h"
@@ -547,16 +546,6 @@ Document::Document(Frame* frame, const URL& url, unsigned documentClasses, unsig
         m_nodeListAndCollectionCounts[i] = 0;
 }
 
-static void histogramMutationEventUsage(const unsigned short& listenerTypes)
-{
-    HistogramSupport::histogramEnumeration("DOMAPI.PerDocumentMutationEventUsage.DOMSubtreeModified", static_cast<bool>(listenerTypes & Document::DOMSUBTREEMODIFIED_LISTENER), 2);
-    HistogramSupport::histogramEnumeration("DOMAPI.PerDocumentMutationEventUsage.DOMNodeInserted", static_cast<bool>(listenerTypes & Document::DOMNODEINSERTED_LISTENER), 2);
-    HistogramSupport::histogramEnumeration("DOMAPI.PerDocumentMutationEventUsage.DOMNodeRemoved", static_cast<bool>(listenerTypes & Document::DOMNODEREMOVED_LISTENER), 2);
-    HistogramSupport::histogramEnumeration("DOMAPI.PerDocumentMutationEventUsage.DOMNodeRemovedFromDocument", static_cast<bool>(listenerTypes & Document::DOMNODEREMOVEDFROMDOCUMENT_LISTENER), 2);
-    HistogramSupport::histogramEnumeration("DOMAPI.PerDocumentMutationEventUsage.DOMNodeInsertedIntoDocument", static_cast<bool>(listenerTypes & Document::DOMNODEINSERTEDINTODOCUMENT_LISTENER), 2);
-    HistogramSupport::histogramEnumeration("DOMAPI.PerDocumentMutationEventUsage.DOMCharacterDataModified", static_cast<bool>(listenerTypes & Document::DOMCHARACTERDATAMODIFIED_LISTENER), 2);
-}
-
 #if ENABLE(FULLSCREEN_API)
 static bool isAttributeOnAllOwners(const WebCore::QualifiedName& attribute, const WebCore::QualifiedName& prefixedAttribute, const HTMLFrameOwnerElement* owner)
 {
@@ -603,8 +592,6 @@ Document::~Document()
 
     m_scriptRunner = nullptr;
 
-    histogramMutationEventUsage(m_listenerTypes);
-
     removeAllEventListeners();
 
     // Currently we believe that Document can never outlive the parser.
index a4b49d7..5bfeb79 100644 (file)
@@ -28,7 +28,6 @@
 #include "ShadowRoot.h"
 
 #include "ElementTraversal.h"
-#include "HistogramSupport.h"
 #include "InsertionPoint.h"
 #include "RenderElement.h"
 #include "RuntimeEnabledFeatures.h"
index 40cc54a..f466ee2 100644 (file)
@@ -33,7 +33,6 @@
 
 #include "BlobURL.h"
 #include "File.h"
-#include "HistogramSupport.h"
 #include "ScriptExecutionContext.h"
 #include "ThreadableBlobRegistry.h"
 #include <wtf/text/CString.h>
index 35a43f4..4346e6a 100644 (file)
@@ -35,7 +35,6 @@
 #include "Document.h"
 #include "ExceptionCode.h"
 #include "File.h"
-#include "HistogramSupport.h"
 #include "LineEnding.h"
 #include "TextEncoding.h"
 #include <runtime/ArrayBuffer.h>
@@ -73,8 +72,6 @@ void BlobBuilder::append(const String& text, const String& endingType)
 #if ENABLE(BLOB)
 void BlobBuilder::append(ArrayBuffer* arrayBuffer)
 {
-    HistogramSupport::histogramEnumeration("WebCore.Blob.constructor.ArrayBufferOrView", BlobConstructorArrayBuffer, BlobConstructorArrayBufferOrViewMax);
-
     if (!arrayBuffer)
         return;
 
@@ -83,8 +80,6 @@ void BlobBuilder::append(ArrayBuffer* arrayBuffer)
 
 void BlobBuilder::append(PassRefPtr<ArrayBufferView> arrayBufferView)
 {
-    HistogramSupport::histogramEnumeration("WebCore.Blob.constructor.ArrayBufferOrView", BlobConstructorArrayBufferView, BlobConstructorArrayBufferOrViewMax);
-
     if (!arrayBufferView)
         return;
 
index 903b53e..e8aa0b6 100644 (file)
@@ -40,7 +40,6 @@
 #include "FrameLoaderClient.h"
 #include "FrameLoaderStateMachine.h"
 #include "FrameView.h"
-#include "HistogramSupport.h"
 #include "HistoryController.h"
 #include "HistoryItem.h"
 #include "Logging.h"
@@ -181,16 +180,6 @@ static unsigned logCanCacheFrameDecision(Frame* frame, int indentLevel)
         rejectReasons |= 1 << ClientDeniesCaching;
     }
 
-    HistogramSupport::histogramEnumeration("PageCache.FrameCacheable", !rejectReasons, 2);
-    int reasonCount = 0;
-    for (int i = 0; i < NumberOfReasonsFramesCannotBeInPageCache; ++i) {
-        if (rejectReasons & (1 << i)) {
-            ++reasonCount;
-            HistogramSupport::histogramEnumeration("PageCache.FrameRejectReason", i, NumberOfReasonsFramesCannotBeInPageCache);
-        }
-    }
-    HistogramSupport::histogramEnumeration("PageCache.FrameRejectReasonCount", reasonCount, 1 + NumberOfReasonsFramesCannotBeInPageCache);
-
     for (Frame* child = frame->tree().firstChild(); child; child = child->tree().nextSibling())
         rejectReasons |= logCanCacheFrameDecision(child, indentLevel + 1);
     
@@ -267,31 +256,6 @@ static void logCanCachePageDecision(Page* page)
     }
     
     PCLOG(rejectReasons ? " Page CANNOT be cached\n--------" : " Page CAN be cached\n--------");
-
-    HistogramSupport::histogramEnumeration("PageCache.PageCacheable", !rejectReasons, 2);
-    int reasonCount = 0;
-    for (int i = 0; i < NumberOfReasonsPagesCannotBeInPageCache; ++i) {
-        if (rejectReasons & (1 << i)) {
-            ++reasonCount;
-            HistogramSupport::histogramEnumeration("PageCache.PageRejectReason", i, NumberOfReasonsPagesCannotBeInPageCache);
-        }
-    }
-    HistogramSupport::histogramEnumeration("PageCache.PageRejectReasonCount", reasonCount, 1 + NumberOfReasonsPagesCannotBeInPageCache);
-    const bool settingsDisabledPageCache = rejectReasons & (1 << DisabledPageCache);
-    HistogramSupport::histogramEnumeration("PageCache.PageRejectReasonCountExcludingSettings", reasonCount - settingsDisabledPageCache, NumberOfReasonsPagesCannotBeInPageCache);
-
-    // Report also on the frame reasons by page; this is distinct from the per frame statistics since it coalesces the
-    // causes from all subframes together.
-    HistogramSupport::histogramEnumeration("PageCache.FrameCacheableByPage", !frameRejectReasons, 2);
-    int frameReasonCount = 0;
-    for (int i = 0; i <= NumberOfReasonsFramesCannotBeInPageCache; ++i) {
-        if (frameRejectReasons & (1 << i)) {
-            ++frameReasonCount;
-            HistogramSupport::histogramEnumeration("PageCache.FrameRejectReasonByPage", i, NumberOfReasonsFramesCannotBeInPageCache);
-        }
-    }
-
-    HistogramSupport::histogramEnumeration("PageCache.FrameRejectReasonCountByPage", frameReasonCount, 1 + NumberOfReasonsFramesCannotBeInPageCache);
 }
 
 #endif // !defined(NDEBUG)
diff --git a/Source/WebCore/platform/HistogramSupport.cpp b/Source/WebCore/platform/HistogramSupport.cpp
deleted file mode 100644 (file)
index d9ea79c..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2011 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "HistogramSupport.h"
-
-namespace WebCore {
-
-void HistogramSupport::histogramEnumeration(const char*, int, int)
-{
-}
-
-void HistogramSupport::histogramCustomCounts(const char*, int, int, int, int)
-{
-}
-
-} // namespace WebCore
diff --git a/Source/WebCore/platform/HistogramSupport.h b/Source/WebCore/platform/HistogramSupport.h
deleted file mode 100644 (file)
index 9bb265a..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2011 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef HistogramSupport_h
-#define HistogramSupport_h
-
-namespace WebCore {
-
-class HistogramSupport {
-public:
-    static void histogramEnumeration(const char* name, int sample, int boundaryValue);
-    static void histogramCustomCounts(const char* name, int sample, int min, int max, int bucketCount);
-};
-
-} // namespace WebCore
-
-#endif // HistogramSupport_h
index 8e1503e..0c9947c 100644 (file)
@@ -28,7 +28,6 @@
 
 #if USE(LEVELDB)
 
-#include "HistogramSupport.h"
 #include "LevelDBComparator.h"
 #include "LevelDBIterator.h"
 #include "LevelDBSlice.h"
@@ -136,26 +135,6 @@ bool LevelDBDatabase::destroy(const String& fileName)
     return s.ok();
 }
 
-static void histogramLevelDBError(const char* histogramName, const leveldb::Status& s)
-{
-    ASSERT(!s.ok());
-    enum {
-        LevelDBNotFound,
-        LevelDBCorruption,
-        LevelDBIOError,
-        LevelDBOther,
-        LevelDBMaxError
-    };
-    int levelDBError = LevelDBOther;
-    if (s.IsNotFound())
-        levelDBError = LevelDBNotFound;
-    else if (s.IsCorruption())
-        levelDBError = LevelDBCorruption;
-    else if (s.IsIOError())
-        levelDBError = LevelDBIOError;
-    HistogramSupport::histogramEnumeration(histogramName, levelDBError, LevelDBMaxError);
-}
-
 std::unique_ptr<LevelDBDatabase> LevelDBDatabase::open(const String& fileName, const LevelDBComparator* comparator)
 {
     auto comparatorAdapter = std::make_unique<ComparatorAdapter>(comparator);
@@ -164,8 +143,6 @@ std::unique_ptr<LevelDBDatabase> LevelDBDatabase::open(const String& fileName, c
     const leveldb::Status s = openDB(comparatorAdapter.get(), leveldb::IDBEnv(), fileName, &db);
 
     if (!s.ok()) {
-        histogramLevelDBError("WebCore.IndexedDB.LevelDBOpenErrors", s);
-
         LOG_ERROR("Failed to open LevelDB database from %s: %s", fileName.ascii().data(), s.ToString().c_str());
         return nullptr;
     }
index 6f6992a..cb1f40c 100644 (file)
@@ -70,7 +70,6 @@
 #include "HTMLFrameElement.h"
 #include "HTMLFrameOwnerElement.h"
 #include "HTMLNames.h"
-#include "HistogramSupport.h"
 #include "HitTestingTransformState.h"
 #include "HitTestRequest.h"
 #include "HitTestResult.h"
@@ -2178,12 +2177,6 @@ void RenderLayer::updateNeedsCompositedScrolling()
         // layers in WebCore, because we use UIKit to composite our scroll bars.
         m_needsCompositedScrolling = forceUseCompositedScrolling;
 #endif
-        // We gather a boolean value for use with Google UMA histograms to
-        // quantify the actual effects of a set of patches attempting to
-        // relax composited scrolling requirements, thereby increasing the
-        // number of composited overflow divs.
-        if (acceleratedCompositingForOverflowScrollEnabled())
-            HistogramSupport::histogramEnumeration("Renderer.NeedsCompositedScrolling", m_needsCompositedScrolling, 2);
     }
 
     if (oldNeedsCompositedScrolling != m_needsCompositedScrolling) {
index 6387a79..83fdd31 100644 (file)
@@ -35,7 +35,6 @@
 #include "File.h"
 #include "HTMLDocument.h"
 #include "HTTPParsers.h"
-#include "HistogramSupport.h"
 #include "InspectorInstrumentation.h"
 #include "JSDOMBinding.h"
 #include "JSDOMWindow.h"
@@ -703,15 +702,11 @@ void XMLHttpRequest::send(ArrayBuffer* body, ExceptionCode& ec)
     String consoleMessage("ArrayBuffer is deprecated in XMLHttpRequest.send(). Use ArrayBufferView instead.");
     scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Warning, consoleMessage);
 
-    HistogramSupport::histogramEnumeration("WebCore.XHR.send.ArrayBufferOrView", XMLHttpRequestSendArrayBuffer, XMLHttpRequestSendArrayBufferOrViewMax);
-
     sendBytesData(body->data(), body->byteLength(), ec);
 }
 
 void XMLHttpRequest::send(ArrayBufferView* body, ExceptionCode& ec)
 {
-    HistogramSupport::histogramEnumeration("WebCore.XHR.send.ArrayBufferOrView", XMLHttpRequestSendArrayBufferView, XMLHttpRequestSendArrayBufferOrViewMax);
-
     sendBytesData(body->baseAddress(), body->byteLength(), ec);
 }