diff options
| author | Steve Block <steveblock@google.com> | 2012-03-27 18:37:04 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-03-28 16:47:03 +0100 |
| commit | 6ed1fdfa7999878a811b09cdd647fbeace4353b8 (patch) | |
| tree | ad88503212f21676929335576967232e5b63477d /Source/WebCore/workers | |
| parent | db951b2c4c8fce1304a13d97dec4ae14be629380 (diff) | |
| download | external_webkit-6ed1fdfa7999878a811b09cdd647fbeace4353b8.zip external_webkit-6ed1fdfa7999878a811b09cdd647fbeace4353b8.tar.gz external_webkit-6ed1fdfa7999878a811b09cdd647fbeace4353b8.tar.bz2 | |
Cherry-pick WebKit change r87623 to fix use of KURL::prettyURL()
This is a prerequisite for http://trac.webkit.org/changeset/96779 to fix
window.location.
Note that a conflict occurred in
Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp but the
change is not required.
See http://trac.webkit.org/changeset/87623
Bug: 2159848
Change-Id: I5614b3588f30508f81b562aa7fb2f9027c2bda72
Diffstat (limited to 'Source/WebCore/workers')
| -rw-r--r-- | Source/WebCore/workers/WorkerLocation.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/WebCore/workers/WorkerLocation.cpp b/Source/WebCore/workers/WorkerLocation.cpp index b934abd..33aebbb 100644 --- a/Source/WebCore/workers/WorkerLocation.cpp +++ b/Source/WebCore/workers/WorkerLocation.cpp @@ -36,7 +36,8 @@ namespace WebCore { String WorkerLocation::href() const { - return m_url.hasPath() ? m_url.prettyURL() : m_url.prettyURL() + "/"; + // FIXME: Stop using deprecatedString(): https://bugs.webkit.org/show_bug.cgi?id=30225 + return m_url.hasPath() ? m_url.deprecatedString() : m_url.deprecatedString() + "/"; } String WorkerLocation::protocol() const @@ -76,7 +77,8 @@ String WorkerLocation::hash() const String WorkerLocation::toString() const { - return m_url.hasPath() ? m_url.prettyURL() : m_url.prettyURL() + "/"; + // FIXME: Stop using deprecatedString(): https://bugs.webkit.org/show_bug.cgi?id=30225 + return m_url.hasPath() ? m_url.deprecatedString() : m_url.deprecatedString() + "/"; } |