Title: [237637] trunk/Source/WebCore
- Revision
- 237637
- Author
- [email protected]
- Date
- 2018-10-31 08:19:24 -0700 (Wed, 31 Oct 2018)
Log Message
[GTK][WPE] Remaining topPrivatelyControlledDomain() fixes
https://bugs.webkit.org/show_bug.cgi?id=191110
Reviewed by Michael Catanzaro.
Covered by existing tests.
Turns out that this method is expected to reject domains that
are not registrable. Also sync with the Mac implementation in
that given domains that are not all ASCII should be returned
back as is. This fixes the remaining Public Suffix API tests.
* platform/soup/PublicSuffixSoup.cpp:
(WebCore::topPrivatelyControlledDomain):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (237636 => 237637)
--- trunk/Source/WebCore/ChangeLog 2018-10-31 15:08:26 UTC (rev 237636)
+++ trunk/Source/WebCore/ChangeLog 2018-10-31 15:19:24 UTC (rev 237637)
@@ -1,3 +1,20 @@
+2018-10-31 Claudio Saavedra <[email protected]>
+
+ [GTK][WPE] Remaining topPrivatelyControlledDomain() fixes
+ https://bugs.webkit.org/show_bug.cgi?id=191110
+
+ Reviewed by Michael Catanzaro.
+
+ Covered by existing tests.
+
+ Turns out that this method is expected to reject domains that
+ are not registrable. Also sync with the Mac implementation in
+ that given domains that are not all ASCII should be returned
+ back as is. This fixes the remaining Public Suffix API tests.
+
+ * platform/soup/PublicSuffixSoup.cpp:
+ (WebCore::topPrivatelyControlledDomain):
+
2018-10-31 Antti Koivisto <[email protected]>
Remove LayerFlushScheduler
Modified: trunk/Source/WebCore/platform/soup/PublicSuffixSoup.cpp (237636 => 237637)
--- trunk/Source/WebCore/platform/soup/PublicSuffixSoup.cpp 2018-10-31 15:08:26 UTC (rev 237636)
+++ trunk/Source/WebCore/platform/soup/PublicSuffixSoup.cpp 2018-10-31 15:19:24 UTC (rev 237637)
@@ -45,6 +45,8 @@
{
if (domain.isEmpty())
return String();
+ if (!domain.isAllASCII())
+ return domain;
String lowercaseDomain = domain.convertToASCIILowercase();
@@ -57,10 +59,10 @@
if (const char* baseDomain = soup_tld_get_base_domain(domainUTF8.data(), &error.outPtr()))
return String::fromUTF8(baseDomain);
- if (g_error_matches(error.get(), SOUP_TLD_ERROR, SOUP_TLD_ERROR_INVALID_HOSTNAME) || g_error_matches(error.get(), SOUP_TLD_ERROR, SOUP_TLD_ERROR_NOT_ENOUGH_DOMAINS))
+ if (g_error_matches(error.get(), SOUP_TLD_ERROR, SOUP_TLD_ERROR_INVALID_HOSTNAME) || g_error_matches(error.get(), SOUP_TLD_ERROR, SOUP_TLD_ERROR_NOT_ENOUGH_DOMAINS) || g_error_matches(error.get(), SOUP_TLD_ERROR, SOUP_TLD_ERROR_NO_BASE_DOMAIN))
return String();
- if (g_error_matches(error.get(), SOUP_TLD_ERROR, SOUP_TLD_ERROR_IS_IP_ADDRESS) || g_error_matches(error.get(), SOUP_TLD_ERROR, SOUP_TLD_ERROR_NO_BASE_DOMAIN))
+ if (g_error_matches(error.get(), SOUP_TLD_ERROR, SOUP_TLD_ERROR_IS_IP_ADDRESS))
return domain;
ASSERT_NOT_REACHED();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
