[SOUP] Move URLSoup back to WebCore after r238771
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 4 Dec 2018 11:01:17 +0000 (11:01 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 4 Dec 2018 11:01:17 +0000 (11:01 +0000)
commit4f46e5052390f5bce92dab1f8508cedd117e3dd4
tree886fa23626ecb6414d6a0b18de99a3756c68acfc
parent6561dba51d8c4e203e1630576b096cd7a067ecc9
[SOUP] Move URLSoup back to WebCore after r238771
https://bugs.webkit.org/show_bug.cgi?id=192306

Reviewed by Michael Catanzaro.

Source/WebCore:

Add soupURIToURL() and urlToSoupURI() to replace the URL contructor taking a Soup URI and
URL::createSoupURI(). Fix several build failures that showed up after removing the soup includes from URL
header.

* platform/Cookie.h:
* platform/SharedBuffer.h:
* platform/SourcesSoup.txt:
* platform/network/soup/CookieSoup.cpp:
* platform/network/soup/GUniquePtrSoup.h: Renamed from Source/WTF/wtf/glib/GUniquePtrSoup.h.
* platform/network/soup/NetworkStorageSessionSoup.cpp:
(WebCore::NetworkStorageSession::setCookiesFromDOM const):
(WebCore::NetworkStorageSession::deleteCookie const):
(WebCore::NetworkStorageSession::getCookies):
(WebCore::NetworkStorageSession::getRawCookies const):
(WebCore::cookiesForSession):
* platform/network/soup/ResourceErrorSoup.cpp:
(WebCore::failingURI):
* platform/network/soup/ResourceHandleSoup.cpp:
* platform/network/soup/ResourceRequest.h:
(WebCore::ResourceRequest::ResourceRequest):
* platform/network/soup/ResourceRequestSoup.cpp:
(WebCore::ResourceRequest::updateSoupMessageMembers const):
(WebCore::ResourceRequest::updateFromSoupMessage):
(WebCore::ResourceRequest::createSoupURI const):
* platform/network/soup/ResourceResponseSoup.cpp:
(WebCore::ResourceResponse::updateFromSoupMessage):
* platform/network/soup/SocketStreamHandleImpl.h:
* platform/network/soup/SocketStreamHandleImplSoup.cpp:
(WebCore::SocketStreamHandleImpl::create):
* platform/network/soup/SoupNetworkSession.cpp:
* platform/network/soup/URLSoup.cpp: Copied from Source/WTF/wtf/glib/URLSoup.cpp.
(WebCore::soupURIToURL):
(WebCore::urlToSoupURI):
* platform/network/soup/URLSoup.h: Renamed from Source/WTF/wtf/glib/URLSoup.cpp.

Source/WebKit:

Include GUniquePtrSoup from WebCore again and fix several build failures that showed up after removing the soup
includes from URL header.

* NetworkProcess/soup/NetworkDataTaskSoup.cpp:
(WebKit::NetworkDataTaskSoup::tlsConnectionAcceptCertificate):
* PluginProcess/PluginProcess.cpp:
* Shared/API/glib/WebKitURIRequest.cpp:
* Shared/API/glib/WebKitURIResponse.cpp:
* UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp:
* UIProcess/API/glib/WebKitURISchemeRequest.cpp:
(webkit_uri_scheme_request_finish_error): Use soupURIToURL().
* UIProcess/API/glib/WebKitWebView.cpp:
(webkit_web_view_load_uri): Use soupURIToURL().
* UIProcess/API/gtk/WebKitAuthenticationDialog.cpp:
* UIProcess/Launcher/glib/BubblewrapLauncher.h:
* UIProcess/Launcher/glib/FlatpakLauncher.cpp:
* UIProcess/Launcher/glib/FlatpakLauncher.h:

Source/WTF:

In r238771 URL was moved from WebCore to WTF, including the soup implementation. Unfortunately that added
libsoup as a new dependency of libjavascriptcoregtk.

* wtf/PlatformGTK.cmake:
* wtf/PlatformWPE.cmake:
* wtf/URL.h:
* wtf/glib/URLGLib.cpp: Copied from Source/WTF/wtf/glib/URLSoup.cpp.

Tools:

Include GUniquePtrSoup from WebCore again.

* TestWebKitAPI/Tests/WebKitGLib/TestCookieManager.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238851 268f45cc-cd09-0410-ab3c-d52691b4dbfc
36 files changed:
Source/WTF/ChangeLog
Source/WTF/wtf/PlatformGTK.cmake
Source/WTF/wtf/PlatformWPE.cmake
Source/WTF/wtf/URL.h
Source/WTF/wtf/glib/URLGLib.cpp [moved from Source/WTF/wtf/glib/URLSoup.cpp with 61% similarity]
Source/WebCore/ChangeLog
Source/WebCore/platform/Cookie.h
Source/WebCore/platform/SharedBuffer.h
Source/WebCore/platform/SourcesSoup.txt
Source/WebCore/platform/network/soup/CookieSoup.cpp
Source/WebCore/platform/network/soup/GUniquePtrSoup.h [moved from Source/WTF/wtf/glib/GUniquePtrSoup.h with 100% similarity]
Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp
Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
Source/WebCore/platform/network/soup/ResourceRequest.h
Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp
Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp
Source/WebCore/platform/network/soup/SocketStreamHandleImpl.h
Source/WebCore/platform/network/soup/SocketStreamHandleImplSoup.cpp
Source/WebCore/platform/network/soup/SoupNetworkSession.cpp
Source/WebCore/platform/network/soup/URLSoup.cpp [new file with mode: 0644]
Source/WebCore/platform/network/soup/URLSoup.h [new file with mode: 0644]
Source/WebKit/ChangeLog
Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp
Source/WebKit/PluginProcess/PluginProcess.cpp
Source/WebKit/Shared/API/glib/WebKitURIRequest.cpp
Source/WebKit/Shared/API/glib/WebKitURIResponse.cpp
Source/WebKit/UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp
Source/WebKit/UIProcess/API/glib/WebKitURISchemeRequest.cpp
Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
Source/WebKit/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp
Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.h
Source/WebKit/UIProcess/Launcher/glib/FlatpakLauncher.cpp
Source/WebKit/UIProcess/Launcher/glib/FlatpakLauncher.h
Tools/ChangeLog
Tools/TestWebKitAPI/Tests/WebKitGLib/TestCookieManager.cpp