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/page/Location.cpp | |
| 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/page/Location.cpp')
| -rw-r--r-- | Source/WebCore/page/Location.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
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) |