diff options
| author | Steve Block <steveblock@google.com> | 2012-03-27 18:38:35 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-03-28 16:49:16 +0100 |
| commit | c57e584da242d96ba18578a71f4634adc9d1fff6 (patch) | |
| tree | 745a4f9fa89d7517b3cb1c09b021cf1f9ccf2889 /Source/WebCore/platform | |
| parent | 6ed1fdfa7999878a811b09cdd647fbeace4353b8 (diff) | |
| download | external_webkit-c57e584da242d96ba18578a71f4634adc9d1fff6.zip external_webkit-c57e584da242d96ba18578a71f4634adc9d1fff6.tar.gz external_webkit-c57e584da242d96ba18578a71f4634adc9d1fff6.tar.bz2 | |
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
Diffstat (limited to 'Source/WebCore/platform')
| -rw-r--r-- | Source/WebCore/platform/KURLGoogle.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
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<const url_parse::UTF16Char*>(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<const url_parse::UTF16Char*>(portStr.characters()), + url_parse::Component(0, portStr.length())); + m_url.replaceComponents(replacements); } |