From e48d279609693b4d164199748c93ad791547c649 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Tue, 27 Mar 2012 18:40:26 +0100
Subject: 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
---
 Source/WebCore/workers/WorkerLocation.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Source/WebCore/workers/WorkerLocation.h')

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) { }
-- 
cgit v1.1