diff options
| author | Steve Block <steveblock@google.com> | 2012-04-12 08:11:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-12 08:11:56 -0700 |
| commit | 84b96dda1738f816b0ff021d76a16caa9847ee26 (patch) | |
| tree | e79dba6a969753c85e0e87dfada8683d32dab3dc /Source/WebCore/workers/WorkerLocation.h | |
| parent | ba8b643c79877a23cd76135cfc0e72918db70892 (diff) | |
| parent | e48d279609693b4d164199748c93ad791547c649 (diff) | |
| download | external_webkit-84b96dda1738f816b0ff021d76a16caa9847ee26.zip external_webkit-84b96dda1738f816b0ff021d76a16caa9847ee26.tar.gz external_webkit-84b96dda1738f816b0ff021d76a16caa9847ee26.tar.bz2 | |
Merge "Cherry-pick WebKit change r96779 to fix window.location"
Diffstat (limited to 'Source/WebCore/workers/WorkerLocation.h')
| -rw-r--r-- | Source/WebCore/workers/WorkerLocation.h | 4 |
1 files changed, 2 insertions, 2 deletions
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) { } |