<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[162922] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/162922">162922</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-28 01:08:40 -0800 (Tue, 28 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[SOUP] Remove soupURIToKURL
https://bugs.webkit.org/show_bug.cgi?id=127104
Reviewed by Martin Robinson.
Source/WebCore:
In favor of a URL constructor receiving a SoupURI. Also add a
method to URL to create a soupURI.
* GNUmakefile.list.am: Remove SoupURIUtils and add URLSoup.
* PlatformEfl.cmake: Ditto.
* PlatformGTK.cmake: Ditto.
* platform/URL.h: Add URL constructor receiving a SoupURI and
createSoupURI() to create a new soupURI for the URL.
* platform/network/soup/CookieJarSoup.cpp:
(WebCore::setCookiesFromDOM): Use URL::createSoupURI().
(WebCore::cookiesForSession): Ditto.
(WebCore::getRawCookies): Ditto.
(WebCore::deleteCookie): Ditto.
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::doRedirect): Use the new URL constructor instead of
soupURIToKURL.
(WebCore::createSoupRequestAndMessageForHandle): Use URL::createSoupURI().
* platform/network/soup/ResourceRequest.h: Rename soupURI as
createSoupURI to make it clear that the method returns a newly
created SoupURI.
* platform/network/soup/ResourceRequestSoup.cpp:
(WebCore::ResourceRequest::updateSoupMessageMembers): Use URL::createSoupURI().
(WebCore::ResourceRequest::updateSoupMessage): Ditto.
(WebCore::ResourceRequest::updateFromSoupMessage): Use the new URL
constructor instead of soupURIToKURL.
(WebCore::ResourceRequest::createSoupURI): Use URL::createSoupURI().
* platform/network/soup/ResourceResponseSoup.cpp:
(WebCore::ResourceResponse::updateFromSoupMessage): Use the new
URL constructor instead of soupURIToKURL.
* platform/network/soup/SoupURIUtils.cpp: Removed.
* platform/network/soup/SoupURIUtils.h: Removed.
* platform/soup/URLSoup.cpp: Added.
(WebCore::URL::URL):
(WebCore::URL::createSoupURI):
Tools:
* TestWebKitAPI/GNUmakefile.am: Add soup cppflags to WebCore unit
tests, because URL.h now includes GUniquePtrSoup.h.
* TestWebKitAPI/CMakeLists.txt: Ditto.
* WebKitTestRunner/PlatformEfl.cmake: Add soup cppflags to WTR,
because URL.h now includes GUniquePtrSoup.h.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefilelistam">trunk/Source/WebCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCoreplatformURLh">trunk/Source/WebCore/platform/URL.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupCookieJarSoupcpp">trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceRequesth">trunk/Source/WebCore/platform/network/soup/ResourceRequest.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceRequestSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceResponseSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPICMakeListstxt">trunk/Tools/TestWebKitAPI/CMakeLists.txt</a></li>
<li><a href="#trunkToolsTestWebKitAPIGNUmakefileam">trunk/Tools/TestWebKitAPI/GNUmakefile.am</a></li>
<li><a href="#trunkToolsWebKitTestRunnerPlatformEflcmake">trunk/Tools/WebKitTestRunner/PlatformEfl.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformsoupURLSoupcpp">trunk/Source/WebCore/platform/soup/URLSoup.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSoupURIUtilscpp">trunk/Source/WebCore/platform/network/soup/SoupURIUtils.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSoupURIUtilsh">trunk/Source/WebCore/platform/network/soup/SoupURIUtils.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162921 => 162922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-28 08:15:39 UTC (rev 162921)
+++ trunk/Source/WebCore/ChangeLog 2014-01-28 09:08:40 UTC (rev 162922)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2014-01-28 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [SOUP] Remove soupURIToKURL
+ https://bugs.webkit.org/show_bug.cgi?id=127104
+
+ Reviewed by Martin Robinson.
+
+ In favor of a URL constructor receiving a SoupURI. Also add a
+ method to URL to create a soupURI.
+
+ * GNUmakefile.list.am: Remove SoupURIUtils and add URLSoup.
+ * PlatformEfl.cmake: Ditto.
+ * PlatformGTK.cmake: Ditto.
+ * platform/URL.h: Add URL constructor receiving a SoupURI and
+ createSoupURI() to create a new soupURI for the URL.
+ * platform/network/soup/CookieJarSoup.cpp:
+ (WebCore::setCookiesFromDOM): Use URL::createSoupURI().
+ (WebCore::cookiesForSession): Ditto.
+ (WebCore::getRawCookies): Ditto.
+ (WebCore::deleteCookie): Ditto.
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::doRedirect): Use the new URL constructor instead of
+ soupURIToKURL.
+ (WebCore::createSoupRequestAndMessageForHandle): Use URL::createSoupURI().
+ * platform/network/soup/ResourceRequest.h: Rename soupURI as
+ createSoupURI to make it clear that the method returns a newly
+ created SoupURI.
+ * platform/network/soup/ResourceRequestSoup.cpp:
+ (WebCore::ResourceRequest::updateSoupMessageMembers): Use URL::createSoupURI().
+ (WebCore::ResourceRequest::updateSoupMessage): Ditto.
+ (WebCore::ResourceRequest::updateFromSoupMessage): Use the new URL
+ constructor instead of soupURIToKURL.
+ (WebCore::ResourceRequest::createSoupURI): Use URL::createSoupURI().
+ * platform/network/soup/ResourceResponseSoup.cpp:
+ (WebCore::ResourceResponse::updateFromSoupMessage): Use the new
+ URL constructor instead of soupURIToKURL.
+ * platform/network/soup/SoupURIUtils.cpp: Removed.
+ * platform/network/soup/SoupURIUtils.h: Removed.
+ * platform/soup/URLSoup.cpp: Added.
+ (WebCore::URL::URL):
+ (WebCore::URL::createSoupURI):
+
</ins><span class="cx"> 2014-01-27 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Avoid unnecessary string duplications in FileSystemGtk
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (162921 => 162922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.list.am 2014-01-28 08:15:39 UTC (rev 162921)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2014-01-28 09:08:40 UTC (rev 162922)
</span><span class="lines">@@ -5866,8 +5866,6 @@
</span><span class="cx"> Source/WebCore/platform/network/soup/SocketStreamError.h \
</span><span class="cx"> Source/WebCore/platform/network/soup/SocketStreamHandle.h \
</span><span class="cx"> Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp \
</span><del>- Source/WebCore/platform/network/soup/SoupURIUtils.cpp \
- Source/WebCore/platform/network/soup/SoupURIUtils.h \
</del><span class="cx"> Source/WebCore/platform/network/AuthenticationChallengeBase.cpp \
</span><span class="cx"> Source/WebCore/platform/network/AuthenticationChallengeBase.h \
</span><span class="cx"> Source/WebCore/platform/network/AuthenticationClient.h \
</span><span class="lines">@@ -5906,6 +5904,7 @@
</span><span class="cx"> Source/WebCore/platform/network/SocketStreamHandleBase.h \
</span><span class="cx"> Source/WebCore/platform/network/SocketStreamHandleClient.h \
</span><span class="cx"> Source/WebCore/platform/soup/SharedBufferSoup.cpp \
</span><ins>+ Source/WebCore/platform/soup/URLSoup.cpp \
</ins><span class="cx"> Source/WebCore/platform/text/enchant/TextCheckerEnchant.h \
</span><span class="cx"> Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp \
</span><span class="cx"> Source/WebCore/platform/text/icu/UTextProvider.cpp \
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (162921 => 162922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2014-01-28 08:15:39 UTC (rev 162921)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2014-01-28 09:08:40 UTC (rev 162922)
</span><span class="lines">@@ -167,13 +167,13 @@
</span><span class="cx"> platform/network/soup/ResourceResponseSoup.cpp
</span><span class="cx"> platform/network/soup/SocketStreamHandleSoup.cpp
</span><span class="cx"> platform/network/soup/SoupNetworkSession.cpp
</span><del>- platform/network/soup/SoupURIUtils.cpp
</del><span class="cx"> platform/network/soup/SynchronousLoaderClientSoup.cpp
</span><span class="cx">
</span><span class="cx"> platform/posix/FileSystemPOSIX.cpp
</span><span class="cx"> platform/posix/SharedBufferPOSIX.cpp
</span><span class="cx">
</span><span class="cx"> platform/soup/SharedBufferSoup.cpp
</span><ins>+ platform/soup/URLSoup.cpp
</ins><span class="cx">
</span><span class="cx"> platform/text/LocaleICU.cpp
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (162921 => 162922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2014-01-28 08:15:39 UTC (rev 162921)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-01-28 09:08:40 UTC (rev 162922)
</span><span class="lines">@@ -125,10 +125,10 @@
</span><span class="cx"> platform/network/soup/ResourceResponseSoup.cpp
</span><span class="cx"> platform/network/soup/SocketStreamHandleSoup.cpp
</span><span class="cx"> platform/network/soup/SoupNetworkSession.cpp
</span><del>- platform/network/soup/SoupURIUtils.cpp
</del><span class="cx"> platform/network/soup/SynchronousLoaderClientSoup.cpp
</span><span class="cx">
</span><span class="cx"> platform/soup/SharedBufferSoup.cpp
</span><ins>+ platform/soup/URLSoup.cpp
</ins><span class="cx">
</span><span class="cx"> platform/text/icu/UTextProvider.cpp
</span><span class="cx"> platform/text/icu/UTextProviderLatin1.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.h (162921 => 162922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URL.h 2014-01-28 08:15:39 UTC (rev 162921)
+++ trunk/Source/WebCore/platform/URL.h 2014-01-28 09:08:40 UTC (rev 162922)
</span><span class="lines">@@ -35,6 +35,10 @@
</span><span class="cx"> typedef const struct __CFURL* CFURLRef;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(SOUP)
+#include "GUniquePtrSoup.h"
+#endif
+
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> OBJC_CLASS NSURL;
</span><span class="cx"> #endif
</span><span class="lines">@@ -160,6 +164,11 @@
</span><span class="cx"> RetainPtr<CFURLRef> createCFURL() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(SOUP)
+ URL(SoupURI*);
+ GUniquePtr<SoupURI> createSoupURI() const;
+#endif
+
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> URL(NSURL*);
</span><span class="cx"> operator NSURL*() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupCookieJarSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp (162921 => 162922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp 2014-01-28 08:15:39 UTC (rev 162921)
+++ trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp 2014-01-28 09:08:40 UTC (rev 162922)
</span><span class="lines">@@ -88,8 +88,8 @@
</span><span class="cx"> if (!jar)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- GUniquePtr<SoupURI> origin(soup_uri_new(url.string().utf8().data()));
- GUniquePtr<SoupURI> firstPartyURI(soup_uri_new(firstParty.string().utf8().data()));
</del><ins>+ GUniquePtr<SoupURI> origin = url.createSoupURI();
+ GUniquePtr<SoupURI> firstPartyURI = firstParty.createSoupURI();
</ins><span class="cx">
</span><span class="cx"> // Get existing cookies for this origin.
</span><span class="cx"> GSList* existingCookies = soup_cookie_jar_get_cookie_list(jar, origin.get(), TRUE);
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> if (!jar)
</span><span class="cx"> return String();
</span><span class="cx">
</span><del>- GUniquePtr<SoupURI> uri(soup_uri_new(url.string().utf8().data()));
</del><ins>+ GUniquePtr<SoupURI> uri = url.createSoupURI();
</ins><span class="cx"> GUniquePtr<char> cookies(soup_cookie_jar_get_cookies(jar, uri.get(), forHTTPHeader));
</span><span class="cx"> return String::fromUTF8(cookies.get());
</span><span class="cx"> }
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> if (!jar)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- GUniquePtr<SoupURI> uri(soup_uri_new(url.string().utf8().data()));
</del><ins>+ GUniquePtr<SoupURI> uri = url.createSoupURI();
</ins><span class="cx"> GUniquePtr<GSList> cookies(soup_cookie_jar_get_cookie_list(jar, uri.get(), TRUE));
</span><span class="cx"> if (!cookies)
</span><span class="cx"> return false;
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> if (!jar)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- GUniquePtr<SoupURI> uri(soup_uri_new(url.string().utf8().data()));
</del><ins>+ GUniquePtr<SoupURI> uri = url.createSoupURI();
</ins><span class="cx"> GUniquePtr<GSList> cookies(soup_cookie_jar_get_cookie_list(jar, uri.get(), TRUE));
</span><span class="cx"> if (!cookies)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (162921 => 162922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2014-01-28 08:15:39 UTC (rev 162921)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2014-01-28 09:08:40 UTC (rev 162922)
</span><span class="lines">@@ -44,7 +44,6 @@
</span><span class="cx"> #include "ResourceResponse.h"
</span><span class="cx"> #include "SharedBuffer.h"
</span><span class="cx"> #include "SoupNetworkSession.h"
</span><del>-#include "SoupURIUtils.h"
</del><span class="cx"> #include "TextEncoding.h"
</span><span class="cx"> #include <errno.h>
</span><span class="cx"> #include <fcntl.h>
</span><span class="lines">@@ -453,7 +452,7 @@
</span><span class="cx"> ResourceRequest newRequest = handle->firstRequest();
</span><span class="cx"> SoupMessage* message = d->m_soupMessage.get();
</span><span class="cx"> const char* location = soup_message_headers_get_one(message->response_headers, "Location");
</span><del>- URL newURL = URL(soupURIToKURL(soup_message_get_uri(message)), location);
</del><ins>+ URL newURL = URL(URL(soup_message_get_uri(message)), location);
</ins><span class="cx"> bool crossOrigin = !protocolHostAndPortAreEqual(handle->firstRequest().url(), newURL);
</span><span class="cx"> newRequest.setURL(newURL);
</span><span class="cx"> newRequest.setFirstPartyForCookies(newURL);
</span><span class="lines">@@ -981,7 +980,7 @@
</span><span class="cx">
</span><span class="cx"> GOwnPtr<GError> error;
</span><span class="cx">
</span><del>- GUniquePtr<SoupURI> soupURI(request.soupURI());
</del><ins>+ GUniquePtr<SoupURI> soupURI = request.createSoupURI();
</ins><span class="cx"> if (!soupURI)
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceRequest.h (162921 => 162922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceRequest.h 2014-01-28 08:15:39 UTC (rev 162921)
+++ trunk/Source/WebCore/platform/network/soup/ResourceRequest.h 2014-01-28 09:08:40 UTC (rev 162922)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> #ifndef ResourceRequest_h
</span><span class="cx"> #define ResourceRequest_h
</span><span class="cx">
</span><ins>+#include "GUniquePtrSoup.h"
</ins><span class="cx"> #include "ResourceRequestBase.h"
</span><del>-#include "SoupURIUtils.h"
</del><span class="cx"> #include <libsoup/soup.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ResourceRequest(SoupRequest* soupRequest)
</span><del>- : ResourceRequestBase(soupURIToKURL(soup_request_get_uri(soupRequest)), UseProtocolCachePolicy)
</del><ins>+ : ResourceRequestBase(URL(soup_request_get_uri(soupRequest)), UseProtocolCachePolicy)
</ins><span class="cx"> , m_acceptEncoding(true)
</span><span class="cx"> , m_soupFlags(static_cast<SoupMessageFlags>(0))
</span><span class="cx"> , m_initiatingPageID(0)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> uint64_t initiatingPageID() const { return m_initiatingPageID; }
</span><span class="cx"> void setInitiatingPageID(uint64_t pageID) { m_initiatingPageID = pageID; }
</span><span class="cx">
</span><del>- SoupURI* soupURI() const;
</del><ins>+ GUniquePtr<SoupURI> createSoupURI() const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class ResourceRequestBase;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceRequestSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp (162921 => 162922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp 2014-01-28 08:15:39 UTC (rev 162921)
+++ trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp 2014-01-28 09:08:40 UTC (rev 162922)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx"> #include "GUniquePtrSoup.h"
</span><span class="cx"> #include "HTTPParsers.h"
</span><span class="cx"> #include "MIMETypeRegistry.h"
</span><del>-#include "SoupURIUtils.h"
</del><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -33,11 +32,9 @@
</span><span class="cx"> {
</span><span class="cx"> updateSoupMessageHeaders(soupMessage->request_headers);
</span><span class="cx">
</span><del>- String firstPartyString = firstPartyForCookies().string();
- if (!firstPartyString.isEmpty()) {
- GUniquePtr<SoupURI> firstParty(soup_uri_new(firstPartyString.utf8().data()));
</del><ins>+ GUniquePtr<SoupURI> firstParty = firstPartyForCookies().createSoupURI();
+ if (firstParty)
</ins><span class="cx"> soup_message_set_first_party(soupMessage, firstParty.get());
</span><del>- }
</del><span class="cx">
</span><span class="cx"> soup_message_set_flags(soupMessage, m_soupFlags);
</span><span class="cx">
</span><span class="lines">@@ -70,7 +67,7 @@
</span><span class="cx"> {
</span><span class="cx"> g_object_set(soupMessage, SOUP_MESSAGE_METHOD, httpMethod().utf8().data(), NULL);
</span><span class="cx">
</span><del>- GUniquePtr<SoupURI> uri(soupURI());
</del><ins>+ GUniquePtr<SoupURI> uri = createSoupURI();
</ins><span class="cx"> soup_message_set_uri(soupMessage, uri.get());
</span><span class="cx">
</span><span class="cx"> updateSoupMessageMembers(soupMessage);
</span><span class="lines">@@ -93,7 +90,7 @@
</span><span class="cx"> void ResourceRequest::updateFromSoupMessage(SoupMessage* soupMessage)
</span><span class="cx"> {
</span><span class="cx"> bool shouldPortBeResetToZero = m_url.hasPort() && !m_url.port();
</span><del>- m_url = soupURIToKURL(soup_message_get_uri(soupMessage));
</del><ins>+ m_url = URL(soup_message_get_uri(soupMessage));
</ins><span class="cx">
</span><span class="cx"> // SoupURI cannot differeniate between an explicitly specified port 0 and
</span><span class="cx"> // no port specified.
</span><span class="lines">@@ -107,9 +104,8 @@
</span><span class="cx"> if (soupMessage->request_body->data)
</span><span class="cx"> m_httpBody = FormData::create(soupMessage->request_body->data, soupMessage->request_body->length);
</span><span class="cx">
</span><del>- SoupURI* firstParty = soup_message_get_first_party(soupMessage);
- if (firstParty)
- m_firstPartyForCookies = soupURIToKURL(firstParty);
</del><ins>+ if (SoupURI* firstParty = soup_message_get_first_party(soupMessage))
+ m_firstPartyForCookies = URL(firstParty);
</ins><span class="cx">
</span><span class="cx"> m_soupFlags = soup_message_get_flags(soupMessage);
</span><span class="cx">
</span><span class="lines">@@ -143,31 +139,11 @@
</span><span class="cx"> return 10000;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SoupURI* ResourceRequest::soupURI() const
</del><ins>+GUniquePtr<SoupURI> ResourceRequest::createSoupURI() const
</ins><span class="cx"> {
</span><del>- // WebKit does not support fragment identifiers in data URLs, but soup does.
- // Before passing the URL to soup, we should make sure to urlencode any '#'
- // characters, so that soup does not interpret them as fragment identifiers.
- // See http://wkbug.com/68089
- if (m_url.protocolIsData()) {
- String urlString = m_url.string();
- urlString.replace("#", "%23");
- return soup_uri_new(urlString.utf8().data());
- }
-
</del><span class="cx"> URL url = m_url;
</span><span class="cx"> url.removeFragmentIdentifier();
</span><del>- SoupURI* uri = soup_uri_new(url.string().utf8().data());
-
- // Versions of libsoup prior to 2.42 have a soup_uri_new that will convert empty passwords that are not
- // prefixed by a colon into null. Some parts of soup like the SoupAuthenticationManager will only be active
- // when both the username and password are non-null. When we have credentials, empty usernames and passwords
- // should be empty strings instead of null.
- if (!url.user().isEmpty() || !url.pass().isEmpty()) {
- soup_uri_set_user(uri, url.user().utf8().data());
- soup_uri_set_password(uri, url.pass().utf8().data());
- }
- return uri;
</del><ins>+ return url.createSoupURI();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceResponseSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp (162921 => 162922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp 2014-01-28 08:15:39 UTC (rev 162921)
+++ trunk/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp 2014-01-28 09:08:40 UTC (rev 162922)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx">
</span><span class="cx"> #include "HTTPParsers.h"
</span><span class="cx"> #include "MIMETypeRegistry.h"
</span><del>-#include "SoupURIUtils.h"
</del><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -57,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> void ResourceResponse::updateFromSoupMessage(SoupMessage* soupMessage)
</span><span class="cx"> {
</span><del>- m_url = soupURIToKURL(soup_message_get_uri(soupMessage));
</del><ins>+ m_url = URL(soup_message_get_uri(soupMessage));
</ins><span class="cx">
</span><span class="cx"> m_httpStatusCode = soupMessage->status_code;
</span><span class="cx"> setHTTPStatusText(soupMessage->reason_phrase);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSoupURIUtilscpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/soup/SoupURIUtils.cpp (162921 => 162922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SoupURIUtils.cpp 2014-01-28 08:15:39 UTC (rev 162921)
+++ trunk/Source/WebCore/platform/network/soup/SoupURIUtils.cpp 2014-01-28 09:08:40 UTC (rev 162922)
</span><span class="lines">@@ -1,44 +0,0 @@
</span><del>-/*
- * Copyright (C) 20010 Igalia S.L.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-#include "SoupURIUtils.h"
-
-#include <libsoup/soup.h>
-#include <wtf/gobject/GUniquePtr.h>
-
-namespace WebCore {
-
-// Motivated by https://bugs.webkit.org/show_bug.cgi?id=38956. libsoup
-// does not add the password to the URL when calling
-// soup_uri_to_string, and thus the requests are not properly
-// built. Fixing soup_uri_to_string is a no-no as the maintainer does
-// not want to break compatibility with previous implementations
-URL soupURIToKURL(SoupURI* soupURI)
-{
- GUniquePtr<gchar> urlString(soup_uri_to_string(soupURI, FALSE));
- URL url(URL(), String::fromUTF8(urlString.get()));
-
- if (!soupURI->password)
- return url;
-
- url.setPass(String::fromUTF8(soupURI->password));
- return url;
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSoupURIUtilsh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/network/soup/SoupURIUtils.h (162921 => 162922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SoupURIUtils.h 2014-01-28 08:15:39 UTC (rev 162921)
+++ trunk/Source/WebCore/platform/network/soup/SoupURIUtils.h 2014-01-28 09:08:40 UTC (rev 162922)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Igalia S.L.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef SoupURIUtils_h
-#define SoupURIUtils_h
-
-#include "URL.h"
-
-typedef struct _SoupURI SoupURI;
-
-namespace WebCore {
-URL soupURIToKURL(SoupURI* soupURI);
-}
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformsoupURLSoupcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/soup/URLSoup.cpp (0 => 162922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/soup/URLSoup.cpp (rev 0)
+++ trunk/Source/WebCore/platform/soup/URLSoup.cpp 2014-01-28 09:08:40 UTC (rev 162922)
</span><span class="lines">@@ -0,0 +1,86 @@
</span><ins>+/*
+ * Copyright (C) 2014 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "URL.h"
+
+#include <libsoup/soup.h>
+#include <wtf/text/CString.h>
+
+namespace WebCore {
+
+URL::URL(SoupURI* soupURI)
+{
+ if (!soupURI) {
+ invalidate();
+ return;
+ }
+
+ GUniquePtr<gchar> urlString(soup_uri_to_string(soupURI, FALSE));
+ parse(String::fromUTF8(urlString.get()));
+ if (!isValid())
+ return;
+
+ // Motivated by https://bugs.webkit.org/show_bug.cgi?id=38956. libsoup
+ // does not add the password to the URL when calling
+ // soup_uri_to_string, and thus the requests are not properly
+ // built. Fixing soup_uri_to_string is a no-no as the maintainer does
+ // not want to break compatibility with previous implementations
+ if (soupURI->password)
+ setPass(String::fromUTF8(soupURI->password));
+}
+
+GUniquePtr<SoupURI> URL::createSoupURI() const
+{
+ if (!isValid())
+ return nullptr;
+
+ // WebKit does not support fragment identifiers in data URLs, but soup does.
+ // Before passing the URL to soup, we should make sure to urlencode any '#'
+ // characters, so that soup does not interpret them as fragment identifiers.
+ // See http://wkbug.com/68089
+ if (protocolIsData()) {
+ String urlString = string();
+ urlString.replace("#", "%23");
+ return GUniquePtr<SoupURI>(soup_uri_new(urlString.utf8().data()));
+ }
+
+ GUniquePtr<SoupURI> soupURI(soup_uri_new(string().utf8().data()));
+
+ // Versions of libsoup prior to 2.42 have a soup_uri_new that will convert empty passwords that are not
+ // prefixed by a colon into null. Some parts of soup like the SoupAuthenticationManager will only be active
+ // when both the username and password are non-null. When we have credentials, empty usernames and passwords
+ // should be empty strings instead of null.
+ String urlUser = user();
+ String urlPass = pass();
+ if (!urlUser.isEmpty() || !urlPass.isEmpty()) {
+ soup_uri_set_user(soupURI.get(), urlUser.utf8().data());
+ soup_uri_set_password(soupURI.get(), urlPass.utf8().data());
+ }
+
+ return soupURI;
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (162921 => 162922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-28 08:15:39 UTC (rev 162921)
+++ trunk/Tools/ChangeLog 2014-01-28 09:08:40 UTC (rev 162922)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-01-28 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [SOUP] Remove soupURIToKURL
+ https://bugs.webkit.org/show_bug.cgi?id=127104
+
+ Reviewed by Martin Robinson.
+
+ * TestWebKitAPI/GNUmakefile.am: Add soup cppflags to WebCore unit
+ tests, because URL.h now includes GUniquePtrSoup.h.
+ * TestWebKitAPI/CMakeLists.txt: Ditto.
+ * WebKitTestRunner/PlatformEfl.cmake: Add soup cppflags to WTR,
+ because URL.h now includes GUniquePtrSoup.h.
+
</ins><span class="cx"> 2014-01-27 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Make webkit_uri_scheme_request_get_web_view() work with CustomProtocols
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPICMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (162921 => 162922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/CMakeLists.txt 2014-01-28 08:15:39 UTC (rev 162921)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt 2014-01-28 09:08:40 UTC (rev 162922)
</span><span class="lines">@@ -15,6 +15,7 @@
</span><span class="cx"> ${WEBCORE_DIR}/platform/graphics
</span><span class="cx"> ${WEBCORE_DIR}/platform/text
</span><span class="cx"> ${WEBCORE_DIR}/platform/network
</span><ins>+ ${WEBCORE_DIR}/platform/network/soup
</ins><span class="cx"> ${WEBKIT2_DIR}/Platform/IPC
</span><span class="cx"> ${WEBKIT2_DIR}/Shared
</span><span class="cx"> ${WEBKIT2_DIR}/Shared/API/c
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIGNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/GNUmakefile.am (162921 => 162922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/GNUmakefile.am 2014-01-28 08:15:39 UTC (rev 162921)
+++ trunk/Tools/TestWebKitAPI/GNUmakefile.am 2014-01-28 09:08:40 UTC (rev 162922)
</span><span class="lines">@@ -284,7 +284,9 @@
</span><span class="cx">
</span><span class="cx"> Programs_TestWebKitAPI_WebCore_TestWebCore_CPPFLAGS = \
</span><span class="cx"> $(Libraries_libTestWebKitAPIMain_la_CPPFLAGS) \
</span><del>- -I$(top_builddir)/DerivedSources/WebCore/include
</del><ins>+ -I$(srcdir)/Source/WebCore/platform/network/soup \
+ -I$(top_builddir)/DerivedSources/WebCore/include \
+ $(LIBSOUP_CFLAGS)
</ins><span class="cx">
</span><span class="cx"> Programs_TestWebKitAPI_WebCore_TestWebCore_CXXFLAGS = \
</span><span class="cx"> -DGTEST_HAS_RTTI=0 \
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerPlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/PlatformEfl.cmake (162921 => 162922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2014-01-28 08:15:39 UTC (rev 162921)
+++ trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2014-01-28 09:08:40 UTC (rev 162922)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> ${TOOLS_DIR}/DumpRenderTree/efl/
</span><span class="cx"> ${WEBKIT2_DIR}/UIProcess/API/efl
</span><span class="cx"> "${WTF_DIR}/wtf/gobject"
</span><ins>+ ${WEBCORE_DIR}/platform/network/soup
</ins><span class="cx"> ${CAIRO_INCLUDE_DIRS}
</span><span class="cx"> ${ECORE_EVAS_INCLUDE_DIRS}
</span><span class="cx"> ${ECORE_FILE_INCLUDE_DIRS}
</span></span></pre>
</div>
</div>
</body>
</html>