diff options
| author | Steve Block <steveblock@google.com> | 2012-03-27 18:40:26 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-03-28 16:54:59 +0100 |
| commit | e48d279609693b4d164199748c93ad791547c649 (patch) | |
| tree | 25780dbbd84520d51c0fd174a299121e0d46f5e2 /Source/WebCore/workers | |
| parent | c57e584da242d96ba18578a71f4634adc9d1fff6 (diff) | |
| download | external_webkit-e48d279609693b4d164199748c93ad791547c649.zip external_webkit-e48d279609693b4d164199748c93ad791547c649.tar.gz external_webkit-e48d279609693b4d164199748c93ad791547c649.tar.bz2 | |
Cherry-pick WebKit change r96779 to fix window.location
See http://trac.webkit.org/changeset/96779
Note that a conflict occurred in Source/WebCore/platform/qt/KURLQt.cpp but the
change is not required.
Bug: 2159848
Change-Id: I56e645b2f187302c6f1858c8c6c291209f130cad
Diffstat (limited to 'Source/WebCore/workers')
| -rw-r--r-- | Source/WebCore/workers/WorkerLocation.cpp | 9 | ||||
| -rw-r--r-- | Source/WebCore/workers/WorkerLocation.h | 4 |
2 files changed, 3 insertions, 10 deletions
diff --git a/Source/WebCore/workers/WorkerLocation.cpp b/Source/WebCore/workers/WorkerLocation.cpp index 33aebbb..319a528 100644 --- a/Source/WebCore/workers/WorkerLocation.cpp +++ b/Source/WebCore/workers/WorkerLocation.cpp @@ -36,8 +36,7 @@ namespace WebCore { String WorkerLocation::href() const { - // FIXME: Stop using deprecatedString(): https://bugs.webkit.org/show_bug.cgi?id=30225 - return m_url.hasPath() ? m_url.deprecatedString() : m_url.deprecatedString() + "/"; + return m_url.string(); } String WorkerLocation::protocol() const @@ -75,12 +74,6 @@ String WorkerLocation::hash() const return m_url.fragmentIdentifier().isEmpty() ? "" : "#" + m_url.fragmentIdentifier(); } -String WorkerLocation::toString() const -{ - // FIXME: Stop using deprecatedString(): https://bugs.webkit.org/show_bug.cgi?id=30225 - return m_url.hasPath() ? m_url.deprecatedString() : m_url.deprecatedString() + "/"; -} - } // namespace WebCore diff --git a/Source/WebCore/workers/WorkerLocation.h b/Source/WebCore/workers/WorkerLocation.h index 5200e35..692c0e3 100644 --- a/Source/WebCore/workers/WorkerLocation.h +++ b/Source/WebCore/workers/WorkerLocation.h @@ -30,10 +30,10 @@ #if ENABLE(WORKERS) #include "KURL.h" -#include <wtf/Forward.h> #include <wtf/PassRefPtr.h> #include <wtf/RefCounted.h> #include <wtf/RefPtr.h> +#include <wtf/text/WTFString.h> namespace WebCore { @@ -57,7 +57,7 @@ namespace WebCore { String search() const; String hash() const; - String toString() const; + String toString() const { return href(); } private: WorkerLocation(const KURL& url) : m_url(url) { } |