Title: [208407] trunk/Source/WebCore
- Revision
- 208407
- Author
- [email protected]
- Date
- 2016-11-04 16:59:03 -0700 (Fri, 04 Nov 2016)
Log Message
Move isDefaultPortForProtocol from URLParser.cpp back to URL.cpp
https://bugs.webkit.org/show_bug.cgi?id=164439
Reviewed by Daniel Bates.
No change in behaviour.
* platform/URL.cpp:
(WebCore::defaultPortForProtocol):
(WebCore::isDefaultPortForProtocol):
* platform/URLParser.cpp:
(WebCore::URLParser::defaultPortForProtocol):
(WebCore::URLParser::parsePort):
(WebCore::defaultPortForProtocol): Deleted.
(WebCore::isDefaultPortForProtocol): Deleted.
* platform/URLParser.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (208406 => 208407)
--- trunk/Source/WebCore/ChangeLog 2016-11-04 23:55:00 UTC (rev 208406)
+++ trunk/Source/WebCore/ChangeLog 2016-11-04 23:59:03 UTC (rev 208407)
@@ -1,3 +1,22 @@
+2016-11-04 Alex Christensen <[email protected]>
+
+ Move isDefaultPortForProtocol from URLParser.cpp back to URL.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=164439
+
+ Reviewed by Daniel Bates.
+
+ No change in behaviour.
+
+ * platform/URL.cpp:
+ (WebCore::defaultPortForProtocol):
+ (WebCore::isDefaultPortForProtocol):
+ * platform/URLParser.cpp:
+ (WebCore::URLParser::defaultPortForProtocol):
+ (WebCore::URLParser::parsePort):
+ (WebCore::defaultPortForProtocol): Deleted.
+ (WebCore::isDefaultPortForProtocol): Deleted.
+ * platform/URLParser.h:
+
2016-11-04 Wenson Hsieh <[email protected]>
Safari does not emit composition end if blurred for dead key / Japanese IME
Modified: trunk/Source/WebCore/platform/URL.cpp (208406 => 208407)
--- trunk/Source/WebCore/platform/URL.cpp 2016-11-04 23:55:00 UTC (rev 208406)
+++ trunk/Source/WebCore/platform/URL.cpp 2016-11-04 23:59:03 UTC (rev 208407)
@@ -800,6 +800,16 @@
#endif
+Optional<uint16_t> defaultPortForProtocol(StringView protocol)
+{
+ return URLParser::defaultPortForProtocol(protocol);
+}
+
+bool isDefaultPortForProtocol(uint16_t port, StringView protocol)
+{
+ return defaultPortForProtocol(protocol) == port;
+}
+
bool URL::protocolIs(const char* protocol) const
{
assertProtocolIsGood(StringView(reinterpret_cast<const LChar*>(protocol), strlen(protocol)));
Modified: trunk/Source/WebCore/platform/URLParser.cpp (208406 => 208407)
--- trunk/Source/WebCore/platform/URLParser.cpp 2016-11-04 23:55:00 UTC (rev 208406)
+++ trunk/Source/WebCore/platform/URLParser.cpp 2016-11-04 23:59:03 UTC (rev 208407)
@@ -624,7 +624,7 @@
}
}
-Optional<uint16_t> defaultPortForProtocol(StringView scheme)
+Optional<uint16_t> URLParser::defaultPortForProtocol(StringView scheme)
{
static const uint16_t ftpPort = 21;
static const uint16_t gopherPort = 70;
@@ -689,11 +689,6 @@
}
}
-bool isDefaultPortForProtocol(uint16_t port, StringView protocol)
-{
- return defaultPortForProtocol(protocol) == port;
-}
-
enum class Scheme {
WS,
WSS,
@@ -2560,7 +2555,8 @@
if (!port && digitCount > 1)
syntaxViolation(colonIterator);
- if (UNLIKELY(isDefaultPortForProtocol(port, parsedDataView(0, m_url.m_schemeEnd))))
+ ASSERT(port == static_cast<uint16_t>(port));
+ if (UNLIKELY(defaultPortForProtocol(parsedDataView(0, m_url.m_schemeEnd)) == static_cast<uint16_t>(port)))
syntaxViolation(colonIterator);
else {
appendToASCIIBuffer(':');
Modified: trunk/Source/WebCore/platform/URLParser.h (208406 => 208407)
--- trunk/Source/WebCore/platform/URLParser.h 2016-11-04 23:55:00 UTC (rev 208406)
+++ trunk/Source/WebCore/platform/URLParser.h 2016-11-04 23:59:03 UTC (rev 208407)
@@ -49,6 +49,9 @@
static String serialize(const URLEncodedForm&);
private:
+ static Optional<uint16_t> defaultPortForProtocol(StringView);
+ friend Optional<uint16_t> defaultPortForProtocol(StringView);
+
URL m_url;
Vector<LChar> m_asciiBuffer;
bool m_urlIsSpecial { false };
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
