Changeset 179781 in webkit

Timestamp:

Feb 7, 2015 11:45:15 AM (9 years ago)

Author:

Antti Koivisto

Message:

Use longer hashes for cache keys
​https://bugs.webkit.org/show_bug.cgi?id=141356

Rubber-stamped by Darin Adler.

Folloup and build fix.

• NetworkProcess/cache/NetworkCacheCoders.h:
• NetworkProcess/cache/NetworkCacheKey.cpp:

(WebKit::hashString):

Use containsOnlyASCII instead of is8Bit so both paths always compute the same hash.

• NetworkProcess/cache/NetworkCacheKey.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheCoders.h (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheKey.cpp (modified) (2 diffs)
• NetworkProcess/cache/NetworkCacheKey.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-02-07  Antti Koivisto  <antti@apple.com>
+
+        Use longer hashes for cache keys
+        https://bugs.webkit.org/show_bug.cgi?id=141356
+
+        Rubber-stamped by Darin Adler.
+
+        Folloup and build fix.
+
+        * NetworkProcess/cache/NetworkCacheCoders.h:
+        * NetworkProcess/cache/NetworkCacheKey.cpp:
+        (WebKit::hashString):
+
+            Use containsOnlyASCII instead of is8Bit so both paths always compute the same hash.
+
+        * NetworkProcess/cache/NetworkCacheKey.h:
+
 2015-02-07  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheCoders.h

@@ -36 +36 @@
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
+#include <wtf/MD5.h>
 #include <wtf/Vector.h>
-#include <wtf/md5.h>
 
 namespace WebKit {

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.cpp

@@ -63 +63 @@
 {
     const uint8_t zero = 0;
-    if (string.is8Bit()) {
+    if (string.containsOnlyASCII()) {
         md5.addBytes(string.characters8(), string.length());
         md5.addBytes(&zero, 1);
@@ -89 +89 @@
 {
     StringBuilder builder;
+    builder.reserveCapacity(hashStringLength());
     for (auto byte : m_hash) {
         builder.append(upperNibbleToASCIIHexDigit(byte));

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheKey.h

@@ -29 +29 @@
 #if ENABLE(NETWORK_CACHE)
 
-#include <wtf/md5.h>
+#include <wtf/MD5.h>
 #include <wtf/text/WTFString.h>