Changeset 237366 in webkit

Timestamp:

Oct 23, 2018 1:53:20 PM (6 years ago)

Author:

Truitt Savell

Message:

Unreviewed, rolling out r237357.

API test is now failing on all platforms.

Reverted changeset:

"topPrivatelyControlledDomain is slow"
​https://bugs.webkit.org/show_bug.cgi?id=190792
​https://trac.webkit.org/changeset/237357

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/PublicSuffixMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-10-23  Truitt Savell  <tsavell@apple.com>
+
+        Unreviewed, rolling out r237357.
+
+        API test is now failing on all platforms.
+
+        Reverted changeset:
+
+        "topPrivatelyControlledDomain is slow"
+        https://bugs.webkit.org/show_bug.cgi?id=190792
+        https://trac.webkit.org/changeset/237357
+
 2018-10-23  Truitt Savell  <tsavell@apple.com>
 

trunk/Source/WebCore/platform/mac/PublicSuffixMac.mm

@@ -32 +32 @@
 #import "WebCoreNSURLExtras.h"
 #import <pal/spi/cf/CFNetworkSPI.h>
-#import <wtf/HashMap.h>
-#import <wtf/text/StringHash.h>
 
 namespace WebCore {
@@ -46 +44 @@
 String topPrivatelyControlledDomain(const String& domain)
 {
-    if (domain.isEmpty() || !domain.isAllASCII())
+    if (URL::hostIsIPAddress(domain))
         return domain;
 
-    static NeverDestroyed<HashMap<String, String, ASCIICaseInsensitiveHash>> cache;
-    static Lock cacheLock;
+    if (!domain.isAllASCII())
+        return domain;
+    
+    const auto& lowercaseDomain = domain.convertToASCIILowercase();
+    if (lowercaseDomain == "localhost")
+        return lowercaseDomain;
 
-    auto isolatedDomain = domain.isolatedCopy();
-
-    auto locker = holdLock(cacheLock);
-
-    constexpr auto maximumSizeToPreventUnlimitedGrowth = 128;
-    if (cache.get().size() == maximumSizeToPreventUnlimitedGrowth)
-        cache.get().clear();
-
-    return cache.get().ensure(isolatedDomain, [&isolatedDomain] {
-        const auto lowercaseDomain = isolatedDomain.convertToASCIILowercase();
-        if (lowercaseDomain == "localhost")
-            return lowercaseDomain;
-
-        if (URL::hostIsIPAddress(lowercaseDomain))
-            return lowercaseDomain;
-
-        size_t separatorPosition;
-        for (unsigned labelStart = 0; (separatorPosition = lowercaseDomain.find('.', labelStart)) != notFound; labelStart = separatorPosition + 1) {
-            if (isPublicSuffix(lowercaseDomain.substring(separatorPosition + 1)))
-                return lowercaseDomain.substring(labelStart);
-        }
-        return String();
-    }).iterator->value.isolatedCopy();
+    size_t separatorPosition;
+    for (unsigned labelStart = 0; (separatorPosition = lowercaseDomain.find('.', labelStart)) != notFound; labelStart = separatorPosition + 1) {
+        if (isPublicSuffix(lowercaseDomain.substring(separatorPosition + 1)))
+            return lowercaseDomain.substring(labelStart);
+    }
+    return String();
 }