diff options
| author | Steve Block <steveblock@google.com> | 2012-04-12 07:58:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-12 07:58:25 -0700 |
| commit | 9d5dcb4073f42efce6325ead421506902827febf (patch) | |
| tree | 54de209dd5b07b5c567e36e556f2ceb958f5fa69 /Source/WebCore/page | |
| parent | 2d59667e270387d6bf950a6cf680ab3fe0912808 (diff) | |
| parent | 6ed1fdfa7999878a811b09cdd647fbeace4353b8 (diff) | |
| download | external_webkit-9d5dcb4073f42efce6325ead421506902827febf.zip external_webkit-9d5dcb4073f42efce6325ead421506902827febf.tar.gz external_webkit-9d5dcb4073f42efce6325ead421506902827febf.tar.bz2 | |
Merge "Cherry-pick WebKit change r87623 to fix use of KURL::prettyURL()"
Diffstat (limited to 'Source/WebCore/page')
| -rw-r--r-- | Source/WebCore/page/Location.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/WebCore/page/Location.cpp b/Source/WebCore/page/Location.cpp index 4835a83..5af48cf 100644 --- a/Source/WebCore/page/Location.cpp +++ b/Source/WebCore/page/Location.cpp @@ -64,7 +64,8 @@ String Location::href() const return String(); const KURL& url = this->url(); - return url.hasPath() ? url.prettyURL() : url.prettyURL() + "/"; + // FIXME: Stop using deprecatedString(): https://bugs.webkit.org/show_bug.cgi?id=30225 + return url.hasPath() ? url.deprecatedString() : url.deprecatedString() + "/"; } String Location::protocol() const @@ -153,7 +154,8 @@ String Location::toString() const return String(); const KURL& url = this->url(); - return url.hasPath() ? url.prettyURL() : url.prettyURL() + "/"; + // FIXME: Stop using deprecatedString(): https://bugs.webkit.org/show_bug.cgi?id=30225 + return url.hasPath() ? url.deprecatedString() : url.deprecatedString() + "/"; } void Location::setHref(const String& urlString, DOMWindow* activeWindow, DOMWindow* firstWindow) |