diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebCore/platform/KURLWTFURL.cpp | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebCore/platform/KURLWTFURL.cpp')
| -rw-r--r-- | Source/WebCore/platform/KURLWTFURL.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Source/WebCore/platform/KURLWTFURL.cpp b/Source/WebCore/platform/KURLWTFURL.cpp index 9a3484d41..4d30680ff 100644 --- a/Source/WebCore/platform/KURLWTFURL.cpp +++ b/Source/WebCore/platform/KURLWTFURL.cpp @@ -175,7 +175,7 @@ bool KURL::hasPort() const if (!isValid()) return false; - return !m_urlImpl->m_parsedURL.port().isNull(); + return m_urlImpl->m_parsedURL.hasPort(); } unsigned short KURL::port() const @@ -313,8 +313,11 @@ void KURL::setHost(const String&) void KURL::removePort() { + if (!hasPort()) + return; + detach(m_urlImpl); - // FIXME: Add WTFURL Implementation. + m_urlImpl->m_parsedURL.removePort(); } void KURL::setPort(unsigned short) @@ -423,8 +426,9 @@ void KURL::invalidate() bool KURL::isHierarchical() const { - // FIXME: Add WTFURL Implementation. - return false; + if (!isValid()) + return false; + return m_urlImpl->m_parsedURL.hasStandardScheme(); } bool protocolIs(const String&, const char*) |