From c57e584da242d96ba18578a71f4634adc9d1fff6 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 27 Mar 2012 18:38:35 +0100 Subject: Cherry-pick WebKit change r94132 to fix default port in URLs This is to make sure URL parsing behaviour is up-to-date prior to fixing window.location. See bug for details. Note that a manual edit to HTMLAnchorElement::port() was required to avoid the use of emptyString(). See http://trac.webkit.org/changeset/94132 Bug: 2159848 Change-Id: I13ef58e18df46c1d4592c102d4eb80f54ae53020 --- Source/WebCore/platform/KURLGoogle.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'Source/WebCore/platform/KURLGoogle.cpp') diff --git a/Source/WebCore/platform/KURLGoogle.cpp b/Source/WebCore/platform/KURLGoogle.cpp index 370862f..7bb1d53 100644 --- a/Source/WebCore/platform/KURLGoogle.cpp +++ b/Source/WebCore/platform/KURLGoogle.cpp @@ -670,16 +670,12 @@ void KURL::setPort(unsigned short i) { KURLGooglePrivate::Replacements replacements; String portStr; - if (i) { - portStr = String::number(i); - replacements.SetPort( - reinterpret_cast(portStr.characters()), - url_parse::Component(0, portStr.length())); - } else { - // Clear any existing port when it is set to 0. - replacements.ClearPort(); - } + portStr = String::number(i); + replacements.SetPort( + reinterpret_cast(portStr.characters()), + url_parse::Component(0, portStr.length())); + m_url.replaceComponents(replacements); } -- cgit v1.1