diff options
| author | Steve Block <steveblock@google.com> | 2012-03-27 18:37:04 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-03-28 16:47:03 +0100 |
| commit | 6ed1fdfa7999878a811b09cdd647fbeace4353b8 (patch) | |
| tree | ad88503212f21676929335576967232e5b63477d /Source/WebCore/platform/network | |
| parent | db951b2c4c8fce1304a13d97dec4ae14be629380 (diff) | |
| download | external_webkit-6ed1fdfa7999878a811b09cdd647fbeace4353b8.zip external_webkit-6ed1fdfa7999878a811b09cdd647fbeace4353b8.tar.gz external_webkit-6ed1fdfa7999878a811b09cdd647fbeace4353b8.tar.bz2 | |
Cherry-pick WebKit change r87623 to fix use of KURL::prettyURL()
This is a prerequisite for http://trac.webkit.org/changeset/96779 to fix
window.location.
Note that a conflict occurred in
Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp but the
change is not required.
See http://trac.webkit.org/changeset/87623
Bug: 2159848
Change-Id: I5614b3588f30508f81b562aa7fb2f9027c2bda72
Diffstat (limited to 'Source/WebCore/platform/network')
| -rw-r--r-- | Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp b/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp index dc22fca..ec04035 100644 --- a/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp +++ b/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp @@ -180,9 +180,9 @@ static void ensureSessionIsInitialized(SoupSession* session) g_object_set_data(G_OBJECT(session), "webkit-init", reinterpret_cast<void*>(0xdeadbeef)); } -void ResourceHandle::prepareForURL(const KURL &url) +void ResourceHandle::prepareForURL(const KURL& url) { - GOwnPtr<SoupURI> soupURI(soup_uri_new(url.prettyURL().utf8().data())); + GOwnPtr<SoupURI> soupURI(soup_uri_new(url.string().utf8().data())); if (!soupURI) return; soup_session_prepare_for_uri(ResourceHandle::defaultSession(), soupURI.get()); |