Changeset 76474 in webkit

Timestamp:

Jan 23, 2011 5:00:57 PM (13 years ago)

Author:

Patrick Gansterer

Message:

2011-01-23 Patrick Gansterer <Patrick Gansterer>

Reviewed by Darin Adler.

Use WTF::StringHasher in WebCore
​https://bugs.webkit.org/show_bug.cgi?id=52934

Add an additional function to calculate the hash
of data with a runtimedependent size.

• wtf/StringHasher.h: (WTF::StringHasher::createBlobHash):

2011-01-23 Patrick Gansterer <Patrick Gansterer>

Reviewed by Darin Adler.

Use WTF::StringHasher in WebCore
​https://bugs.webkit.org/show_bug.cgi?id=52934

• loader/appcache/ApplicationCacheStorage.cpp: (WebCore::urlHostHash):
• platform/LinkHash.cpp: (WebCore::visitedLinkHashInline):
• platform/cf/BinaryPropertyList.cpp: (WebCore::IntegerArrayHash::hash):
• platform/graphics/wx/FontPlatformDataWx.cpp: (WebCore::FontPlatformData::computeHash):
• platform/network/ProtectionSpaceHash.h: (WebCore::ProtectionSpaceHash::hash):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/wtf/StringHasher.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/appcache/ApplicationCacheStorage.cpp (modified) (1 diff)
• WebCore/platform/LinkHash.cpp (modified) (1 diff)
• WebCore/platform/cf/BinaryPropertyList.cpp (modified) (1 diff)
• WebCore/platform/graphics/wx/FontPlatformDataWx.cpp (modified) (1 diff)
• WebCore/platform/network/ProtectionSpaceHash.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-01-23  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Use WTF::StringHasher in WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=52934
+
+        Add an additional function to calculate the hash
+        of data with a runtimedependent size.
+
+        * wtf/StringHasher.h:
+        (WTF::StringHasher::createBlobHash):
+
 2011-01-23  Patrick Gansterer  <paroga@webkit.org>
 

trunk/Source/JavaScriptCore/wtf/StringHasher.h

@@ -142 +142 @@
     }
 
+    static inline unsigned createBlobHash(const void* data, unsigned size)
+    {
+        ASSERT(!(size % 2));
+        return createHash<UChar>(static_cast<const UChar*>(data), size / sizeof(UChar));
+    }
+
 private:
     static inline UChar defaultCoverter(UChar ch)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-23  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Use WTF::StringHasher in WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=52934
+
+        * loader/appcache/ApplicationCacheStorage.cpp:
+        (WebCore::urlHostHash):
+        * platform/LinkHash.cpp:
+        (WebCore::visitedLinkHashInline):
+        * platform/cf/BinaryPropertyList.cpp:
+        (WebCore::IntegerArrayHash::hash):
+        * platform/graphics/wx/FontPlatformDataWx.cpp:
+        (WebCore::FontPlatformData::computeHash):
+        * platform/network/ProtectionSpaceHash.h:
+        (WebCore::ProtectionSpaceHash::hash):
+
 2011-01-23  Patrick Gansterer  <paroga@webkit.org>
 

trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp

@@ -90 +90 @@
     unsigned hostEnd = url.hostEnd();
     
-    return AlreadyHashed::avoidDeletedValue(StringImpl::computeHash(url.string().characters() + hostStart, hostEnd - hostStart));
+    return AlreadyHashed::avoidDeletedValue(WTF::StringHasher::createHash(url.string().characters() + hostStart, hostEnd - hostStart));
 }
 

trunk/Source/WebCore/platform/LinkHash.cpp

@@ -198 +198 @@
 static ALWAYS_INLINE LinkHash visitedLinkHashInline(const UChar* url, unsigned length)
 {
-    return AlreadyHashed::avoidDeletedValue(StringImpl::computeHash(url, length));
+    return AlreadyHashed::avoidDeletedValue(WTF::StringHasher::createHash(url, length));
 }
 

trunk/Source/WebCore/platform/cf/BinaryPropertyList.cpp

@@ -93 +93 @@
 unsigned IntegerArrayHash::hash(const IntegerArray& array)
 {
-    return StringImpl::computeHash(reinterpret_cast<const UChar*>(array.integers()), array.size() / (sizeof(int) / sizeof(UChar)));
+    return WTF::StringHasher::createBlobHash(array.integers(), array.size());
 }
 

trunk/Source/WebCore/platform/graphics/wx/FontPlatformDataWx.cpp

@@ -127 +127 @@
         thisFont->GetWeight(),
         thisFont->GetUnderlined(), 
-        StringImpl::computeHash(thisFont->GetFaceName().utf8_str())
+        WTF::StringHasher::createHash(thisFont->GetFaceName().utf8_str())
     };
 

trunk/Source/WebCore/platform/network/ProtectionSpaceHash.h

@@ -43 +43 @@
         };
 
-        unsigned codeCount = sizeof(hashCodes) / sizeof(UChar);
+        unsigned codeCount = sizeof(hashCodes);
         // Ignore realm for proxies.
         if (protectionSpace.isProxy())
-            codeCount -= sizeof(hashCodes[0]) / sizeof(UChar);
-        return StringImpl::computeHash(reinterpret_cast<UChar*>(hashCodes), codeCount);
+            codeCount -= sizeof(hashCodes[0]);
+        return WTF::StringHasher::createBlobHash(hashCodes, codeCount);
     }