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/workers | |
| 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/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() + "/"; } |