Title: [217661] trunk/Source/WebCore
Revision
217661
Author
cdu...@apple.com
Date
2017-06-01 10:04:09 -0700 (Thu, 01 Jun 2017)

Log Message

Unreviewed, rolling out r217660.

This should not have landed given that the new assertion is
hit on debug EWS bots

Reverted changeset:

"Make sure we don't access WebCore::defaultPortForProtocol
from non-main thread"
https://bugs.webkit.org/show_bug.cgi?id=172797
http://trac.webkit.org/changeset/217660

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (217660 => 217661)


--- trunk/Source/WebCore/ChangeLog	2017-06-01 16:54:18 UTC (rev 217660)
+++ trunk/Source/WebCore/ChangeLog	2017-06-01 17:04:09 UTC (rev 217661)
@@ -1,3 +1,17 @@
+2017-06-01  Chris Dumez  <cdu...@apple.com>
+
+        Unreviewed, rolling out r217660.
+
+        This should not have landed given that the new assertion is
+        hit on debug EWS bots
+
+        Reverted changeset:
+
+        "Make sure we don't access WebCore::defaultPortForProtocol
+        from non-main thread"
+        https://bugs.webkit.org/show_bug.cgi?id=172797
+        http://trac.webkit.org/changeset/217660
+
 2017-06-01  Brent Fulgham  <bfulg...@apple.com>
 
         Make sure we don't access WebCore::defaultPortForProtocol from non-main thread

Modified: trunk/Source/WebCore/platform/URL.cpp (217660 => 217661)


--- trunk/Source/WebCore/platform/URL.cpp	2017-06-01 16:54:18 UTC (rev 217660)
+++ trunk/Source/WebCore/platform/URL.cpp	2017-06-01 17:04:09 UTC (rev 217661)
@@ -35,7 +35,6 @@
 #include <unicode/uidna.h>
 #include <wtf/HashMap.h>
 #include <wtf/HexNumber.h>
-#include <wtf/MainThread.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/UUID.h>
@@ -564,7 +563,6 @@
 
 std::optional<uint16_t> defaultPortForProtocol(StringView protocol)
 {
-    ASSERT(isMainThread());
     const auto& defaultPortForProtocolMap = defaultPortForProtocolMapForTesting();
     auto iterator = defaultPortForProtocolMap.find(protocol.toStringWithoutCopying());
     if (iterator != defaultPortForProtocolMap.end())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to