Changeset 240341 in webkit


Ignore:
Timestamp:
Jan 23, 2019 9:26:50 AM (5 years ago)
Author:
Michael Catanzaro
Message:

[SOUP] Remove libsoup cruft from WebProcess
​https://bugs.webkit.org/show_bug.cgi?id=193710

Reviewed by Carlos Garcia Campos.

SoupNetworkSession is no longer accessible from the web process because it's owned
(indirectly) by NetworkProcess after r240292. It doesn't make sense to have any libsoup
code under WebProcess anymore. The current libsoup code consists of (a) unused stuff to be
removed, (b) stuff unrelated to libsoup, which should move to a WebProcessGLib.cpp, and (c)
WebKitSoupRequestInputStream, which is only used by NetworkProcess and should move there

  • NetworkProcess/soup/WebKitSoupRequestInputStream.cpp: Renamed from Source/WebKit/WebProcess/soup/WebKitSoupRequestInputStream.cpp.

(AsyncReadData::AsyncReadData):
(webkitSoupRequestInputStreamReadAsyncResultComplete):
(webkitSoupRequestInputStreamPendingReadAsyncComplete):
(webkitSoupRequestInputStreamHasDataToRead):
(webkitSoupRequestInputStreamIsWaitingForData):
(webkitSoupRequestInputStreamReadAsync):
(webkitSoupRequestInputStreamReadFinish):
(webkitSoupRequestInputStreamFinalize):
(webkit_soup_request_input_stream_init):
(webkit_soup_request_input_stream_class_init):
(webkitSoupRequestInputStreamNew):
(webkitSoupRequestInputStreamAddData):
(webkitSoupRequestInputStreamDidFailWithError):
(webkitSoupRequestInputStreamFinished):

  • NetworkProcess/soup/WebKitSoupRequestInputStream.h: Renamed from Source/WebKit/WebProcess/soup/WebKitSoupRequestInputStream.h.
  • SourcesGTK.txt:
  • SourcesWPE.txt:
  • UIProcess/soup/WebProcessPoolSoup.cpp:

(WebKit::WebProcessPool::setNetworkProxySettings): Don't send message to web processes.

  • WebProcess/WebProcess.h:
  • WebProcess/WebProcess.messages.in:
  • WebProcess/glib/WebProcessGLib.cpp: Renamed from Source/WebKit/WebProcess/soup/WebProcessSoup.cpp.

(WebKit::WebProcess::platformSetCacheModel):
(WebKit::WebProcess::platformInitializeWebProcess):
(WebKit::WebProcess::platformTerminate):

Location:
trunk/Source/WebKit
Files:
1 added
1 deleted
6 edited
3 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r240340 r240341  
     12019-01-23  Michael Catanzaro  <mcatanzaro@igalia.com>
     2
     3        [SOUP] Remove libsoup cruft from WebProcess
     4        https://bugs.webkit.org/show_bug.cgi?id=193710
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        SoupNetworkSession is no longer accessible from the web process because it's owned
     9        (indirectly) by NetworkProcess after r240292. It doesn't make sense to have any libsoup
     10        code under WebProcess anymore. The current libsoup code consists of (a) unused stuff to be
     11        removed, (b) stuff unrelated to libsoup, which should move to a WebProcessGLib.cpp, and (c)
     12        WebKitSoupRequestInputStream, which is only used by NetworkProcess and should move there
     13
     14        * NetworkProcess/soup/WebKitSoupRequestInputStream.cpp: Renamed from Source/WebKit/WebProcess/soup/WebKitSoupRequestInputStream.cpp.
     15        (AsyncReadData::AsyncReadData):
     16        (webkitSoupRequestInputStreamReadAsyncResultComplete):
     17        (webkitSoupRequestInputStreamPendingReadAsyncComplete):
     18        (webkitSoupRequestInputStreamHasDataToRead):
     19        (webkitSoupRequestInputStreamIsWaitingForData):
     20        (webkitSoupRequestInputStreamReadAsync):
     21        (webkitSoupRequestInputStreamReadFinish):
     22        (webkitSoupRequestInputStreamFinalize):
     23        (webkit_soup_request_input_stream_init):
     24        (webkit_soup_request_input_stream_class_init):
     25        (webkitSoupRequestInputStreamNew):
     26        (webkitSoupRequestInputStreamAddData):
     27        (webkitSoupRequestInputStreamDidFailWithError):
     28        (webkitSoupRequestInputStreamFinished):
     29        * NetworkProcess/soup/WebKitSoupRequestInputStream.h: Renamed from Source/WebKit/WebProcess/soup/WebKitSoupRequestInputStream.h.
     30        * SourcesGTK.txt:
     31        * SourcesWPE.txt:
     32        * UIProcess/soup/WebProcessPoolSoup.cpp:
     33        (WebKit::WebProcessPool::setNetworkProxySettings): Don't send message to web processes.
     34        * WebProcess/WebProcess.h:
     35        * WebProcess/WebProcess.messages.in:
     36        * WebProcess/glib/WebProcessGLib.cpp: Renamed from Source/WebKit/WebProcess/soup/WebProcessSoup.cpp.
     37        (WebKit::WebProcess::platformSetCacheModel):
     38        (WebKit::WebProcess::platformInitializeWebProcess):
     39        (WebKit::WebProcess::platformTerminate):
     40
    1412019-01-23  Michael Catanzaro  <mcatanzaro@igalia.com>
    242

  • trunk/Source/WebKit/NetworkProcess/soup/WebKitSoupRequestInputStream.h

    r240340 r240341  
    1818 */
    1919
    20 #ifndef WebKitSoupRequestInputStream_h
    21 #define WebKitSoupRequestInputStream_h
     20#pragma once
    2221
    2322#include <WebCore/ResourceError.h>
    … …  
    5453
    5554G_END_DECLS
    56 
    57 #endif // WebKitSoupRequestInputStream_h

  • trunk/Source/WebKit/SourcesGTK.txt

    r239747 r240341  
    4343NetworkProcess/soup/NetworkSessionSoup.cpp
    4444NetworkProcess/soup/RemoteNetworkingContextSoup.cpp
     45NetworkProcess/soup/WebKitSoupRequestInputStream.cpp
    4546
    4647NetworkProcess/webrtc/LibWebRTCSocketClient.cpp
    … …  
    413414WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp
    414415
     416WebProcess/glib/WebProcessGLib.cpp
     417
    415418WebProcess/gtk/WaylandCompositorDisplay.cpp
    416419WebProcess/gtk/WebProcessMainGtk.cpp
    417420
    418 WebProcess/soup/WebKitSoupRequestInputStream.cpp
    419 WebProcess/soup/WebProcessSoup.cpp
    420 
    421421WebProcess/Plugins/Netscape/NetscapePluginNone.cpp

  • trunk/Source/WebKit/SourcesWPE.txt

    r239747 r240341  
    3939NetworkProcess/soup/NetworkSessionSoup.cpp
    4040NetworkProcess/soup/RemoteNetworkingContextSoup.cpp
     41NetworkProcess/soup/WebKitSoupRequestInputStream.cpp
    4142
    4243NetworkProcess/webrtc/LibWebRTCSocketClient.cpp
    … …  
    251252WebProcess/WebPage/wpe/WebPageWPE.cpp
    252253
    253 WebProcess/soup/WebKitSoupRequestInputStream.cpp
    254 WebProcess/soup/WebProcessSoup.cpp
     254WebProcess/glib/WebProcessGLib.cpp
    255255
    256256WebProcess/wpe/WebProcessMainWPE.cpp

  • trunk/Source/WebKit/UIProcess/soup/WebProcessPoolSoup.cpp

    r223179 r240341  
    5757{
    5858    m_networkProxySettings = settings;
    59     sendToAllProcesses(Messages::WebProcess::SetNetworkProxySettings(m_networkProxySettings));
    6059    if (m_networkProcess)
    6160        m_networkProcess->send(Messages::NetworkProcess::SetNetworkProxySettings(m_networkProxySettings), 0);

  • trunk/Source/WebKit/WebProcess/WebProcess.h

    r240292 r240341  
    7474struct PrewarmInformation;
    7575struct SecurityOriginData;
    76 struct SoupNetworkProxySettings;
    7776
    7877#if ENABLE(SERVICE_WORKER)
    … …  
    320319    void gamepadDisconnected(unsigned index);
    321320#endif
    322 #if USE(SOUP)
    323     void setNetworkProxySettings(const WebCore::SoupNetworkProxySettings&);
    324 #endif
     321
    325322#if ENABLE(SERVICE_WORKER)
    326323    void establishWorkerContextConnectionToNetworkProcess(uint64_t pageGroupID, uint64_t pageID, const WebPreferencesStore&, PAL::SessionID);

  • trunk/Source/WebKit/WebProcess/WebProcess.messages.in

    r240292 r240341  
    110110#endif
    111111
    112 #if USE(SOUP)
    113     SetNetworkProxySettings(struct WebCore::SoupNetworkProxySettings settings)
    114 #endif
    115 
    116112#if ENABLE(SERVICE_WORKER)
    117113    EstablishWorkerContextConnectionToNetworkProcess(uint64_t pageGroupID, uint64_t pageID, struct WebKit::WebPreferencesStore store, PAL::SessionID initialSessionID)

  • trunk/Source/WebKit/WebProcess/glib/WebProcessGLib.cpp

    r240340 r240341  
    3131#include <WebCore/GStreamerCommon.h>
    3232#include <WebCore/MemoryCache.h>
    33 #include <WebCore/NetworkStorageSession.h>
    34 #include <WebCore/SoupNetworkSession.h>
    3533
    3634#if PLATFORM(WAYLAND)
    … …  
    4745void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters&& parameters)
    4846{
    49     if (parameters.proxySettings.mode != WebCore::SoupNetworkProxySettings::Mode::Default)
    50         setNetworkProxySettings(parameters.proxySettings);
    51 
    5247#if PLATFORM(WAYLAND)
    5348    m_waylandCompositorDisplay = WaylandCompositorDisplay::create(parameters.waylandCompositorDisplayName);
    … …  
    6257}
    6358
    64 void WebProcess::setNetworkProxySettings(const WebCore::SoupNetworkProxySettings& settings)
    65 {
    66     WebCore::SoupNetworkSession::setProxySettings(settings);
    67 }
    68 
    6959} // namespace WebKit
Note: See TracChangeset for help on using the changeset viewer.