From e48d279609693b4d164199748c93ad791547c649 Mon Sep 17 00:00:00 2001 From: Steve Block 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/page/Location.cpp | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'Source/WebCore/page/Location.cpp') diff --git a/Source/WebCore/page/Location.cpp b/Source/WebCore/page/Location.cpp index 9528437..fb68a09 100644 --- a/Source/WebCore/page/Location.cpp +++ b/Source/WebCore/page/Location.cpp @@ -63,9 +63,7 @@ String Location::href() const if (!m_frame) return String(); - const KURL& url = this->url(); - // FIXME: Stop using deprecatedString(): https://bugs.webkit.org/show_bug.cgi?id=30225 - return url.hasPath() ? url.deprecatedString() : url.deprecatedString() + "/"; + return url().string(); } String Location::protocol() const @@ -148,16 +146,6 @@ String Location::getParameter(const String& name) const return parameters.get(name); } -String Location::toString() const -{ - if (!m_frame) - return String(); - - const KURL& url = this->url(); - // FIXME: Stop using deprecatedString(): https://bugs.webkit.org/show_bug.cgi?id=30225 - return url.hasPath() ? url.deprecatedString() : url.deprecatedString() + "/"; -} - void Location::setHref(const String& urlString, DOMWindow* activeWindow, DOMWindow* firstWindow) { if (!m_frame) -- cgit v1.1