Changeset 229426 in webkit


Ignore:
Timestamp:
Mar 8, 2018 12:43:34 PM (6 years ago)
Author:
Brent Fulgham
Message:

Remove WebCookieManager and messaging from WebContent process.
​https://bugs.webkit.org/show_bug.cgi?id=183382
<rdar://problem/38191450>

Reviewed by Alex Christensen.

Networking access was fully removed from the WebContent process in Bug 183192 (and related bugs). The
UIProcess no longer needs to ask the WebContent process about networking-related things, and shouldn't
waste everyone's time doing so.

This bug removes some left-over WebCookieManager API stuff, and is a first step in purging the
WebContent Process from accessing cookie data.

  • NetworkProcess/Cookies: Copied from WebProcess/Cookies.
  • NetworkProcess/Cookies/WebCookieManager.h:
  • WebKit.xcodeproj/project.pbxproj:
  • WebProcess/Cookies: Removed.
  • WebProcess/Cookies/WebCookieManager.cpp: Removed.
  • WebProcess/Cookies/WebCookieManager.h: Removed.
  • WebProcess/Cookies/WebCookieManager.messages.in: Removed.
  • WebProcess/Cookies/curl: Removed.
  • WebProcess/Cookies/curl/WebCookieManagerCurl.cpp: Removed.
  • WebProcess/Cookies/mac: Removed.
  • WebProcess/Cookies/mac/WebCookieManagerMac.mm: Removed.
  • WebProcess/Cookies/soup: Removed.
  • WebProcess/Cookies/soup/WebCookieManagerSoup.cpp: Removed.
  • WebProcess/InjectedBundle/InjectedBundle.cpp: Remove 'WebCookieManager.h" header.
  • WebProcess/WebCoreSupport/WebPlatformStrategies.cpp: Ditto.
  • WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm: Ditto.
  • WebProcess/WebProcess.cpp:

(WebKit::WebProcess::WebProcess): Remove call to add WebCookieManager as a
WebProcessSupplement.

  • CMakeLists.txt: Revised paths.
  • DerivedSources.make: Ditto.
  • PlatformMac.cmake: Ditto.
  • PlatformWin.cmake: Ditto.
  • SourcesGTK.txt: Ditto.
  • SourcesWPE.txt: Ditto.
Location:
trunk/Source/WebKit
Files:
4 added
1 deleted
12 edited
6 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/CMakeLists.txt

    r229376 r229426  
    66    "${WEBKIT_DIR}"
    77    "${WEBKIT_DIR}/NetworkProcess"
     8    "${WEBKIT_DIR}/NetworkProcess/Cookies"
    89    "${WEBKIT_DIR}/NetworkProcess/CustomProtocols"
    910    "${WEBKIT_DIR}/NetworkProcess/Downloads"
    … …  
    5758    "${WEBKIT_DIR}/WebProcess/Automation"
    5859    "${WEBKIT_DIR}/WebProcess/Cache"
    59     "${WEBKIT_DIR}/WebProcess/Cookies"
    6060    "${WEBKIT_DIR}/WebProcess/Databases"
    6161    "${WEBKIT_DIR}/WebProcess/Databases/IndexedDB"
    … …  
    9898
    9999set(WebKit_SOURCES
     100    NetworkProcess/Cookies/WebCookieManager.cpp
     101    NetworkProcess/Cookies/WebCookieManager.messages.in
     102
    100103    NetworkProcess/Downloads/Download.cpp
    101104    NetworkProcess/Downloads/DownloadManager.cpp
    … …  
    464467    WebProcess/Cache/WebCacheStorageProvider.cpp
    465468
    466     WebProcess/Cookies/WebCookieManager.cpp
    467 
    468469    WebProcess/Databases/WebDatabaseProvider.cpp
    469470
    … …  
    668669
    669670    WebProcess/Cache/WebCacheStorageConnection.messages.in
    670 
    671     WebProcess/Cookies/WebCookieManager.messages.in
    672671
    673672    WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.messages.in

  • trunk/Source/WebKit/ChangeLog

    r229421 r229426  
     12018-03-08  Brent Fulgham  <bfulgham@apple.com>
     2
     3        Remove WebCookieManager and messaging from WebContent process.
     4        https://bugs.webkit.org/show_bug.cgi?id=183382
     5        <rdar://problem/38191450>
     6
     7        Reviewed by Alex Christensen.
     8
     9        Networking access was fully removed from the WebContent process in Bug 183192 (and related bugs). The
     10        UIProcess no longer needs to ask the WebContent process about networking-related things, and shouldn't
     11        waste everyone's time doing so.
     12
     13        This bug removes some left-over WebCookieManager API stuff, and is a first step in purging the
     14        WebContent Process from accessing cookie data.
     15
     16        * NetworkProcess/Cookies: Copied from WebProcess/Cookies.
     17        * NetworkProcess/Cookies/WebCookieManager.h:
     18        * WebKit.xcodeproj/project.pbxproj:
     19        * WebProcess/Cookies: Removed.
     20        * WebProcess/Cookies/WebCookieManager.cpp: Removed.
     21        * WebProcess/Cookies/WebCookieManager.h: Removed.
     22        * WebProcess/Cookies/WebCookieManager.messages.in: Removed.
     23        * WebProcess/Cookies/curl: Removed.
     24        * WebProcess/Cookies/curl/WebCookieManagerCurl.cpp: Removed.
     25        * WebProcess/Cookies/mac: Removed.
     26        * WebProcess/Cookies/mac/WebCookieManagerMac.mm: Removed.
     27        * WebProcess/Cookies/soup: Removed.
     28        * WebProcess/Cookies/soup/WebCookieManagerSoup.cpp: Removed.
     29        * WebProcess/InjectedBundle/InjectedBundle.cpp: Remove 'WebCookieManager.h" header.
     30        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp: Ditto.
     31        * WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm: Ditto.
     32        * WebProcess/WebProcess.cpp:
     33        (WebKit::WebProcess::WebProcess): Remove call to add WebCookieManager as a
     34        WebProcessSupplement.
     35        * CMakeLists.txt: Revised paths.
     36        * DerivedSources.make: Ditto.
     37        * PlatformMac.cmake: Ditto.
     38        * PlatformWin.cmake: Ditto.
     39        * SourcesGTK.txt: Ditto.
     40        * SourcesWPE.txt: Ditto.
     41
    1422018-03-08  Youenn Fablet  <youenn@apple.com>
    243

  • trunk/Source/WebKit/DerivedSources.make

    r229081 r229426  
    2424    $(WebKit2) \
    2525    $(WebKit2)/NetworkProcess \
     26    $(WebKit2)/NetworkProcess/Cookies \
    2627    $(WebKit2)/NetworkProcess/cache \
    2728    $(WebKit2)/NetworkProcess/CustomProtocols \
    … …  
    4344    $(WebKit2)/WebProcess/Automation \
    4445    $(WebKit2)/WebProcess/Cache \
    45     $(WebKit2)/WebProcess/Cookies \
    4646    $(WebKit2)/WebProcess/CredentialManagement \
    4747    $(WebKit2)/WebProcess/Databases/IndexedDB \

  • trunk/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.cpp

    r229425 r229426  
    5454    m_process.addMessageReceiver(Messages::WebCookieManager::messageReceiverName(), *this);
    5555}
     56
     57WebCookieManager::~WebCookieManager() = default;
    5658
    5759void WebCookieManager::getHostnamesWithCookies(PAL::SessionID sessionID, CallbackID callbackID)

  • trunk/Source/WebKit/NetworkProcess/Cookies/WebCookieManager.h

    r229425 r229426  
    11/*
    2  * Copyright (C) 2011, 2013, 2016 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011-2018 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    3131#include "NetworkProcessSupplement.h"
    3232#include "OptionalCallbackID.h"
    33 #include "WebProcessSupplement.h"
    3433#include <pal/SessionID.h>
    3534#include <stdint.h>
    … …  
    5049class ChildProcess;
    5150
    52 class WebCookieManager : public WebProcessSupplement, public NetworkProcessSupplement, public IPC::MessageReceiver {
     51class WebCookieManager : public NetworkProcessSupplement, public IPC::MessageReceiver {
    5352    WTF_MAKE_NONCOPYABLE(WebCookieManager);
    5453public:
    5554    WebCookieManager(ChildProcess&);
     55    ~WebCookieManager();
    5656
    5757    static const char* supplementName();

  • trunk/Source/WebKit/PlatformMac.cmake

    r228347 r229426  
    2020
    2121list(APPEND WebKit_SOURCES
     22    NetworkProcess/Cookies/mac/WebCookieManagerMac.mm
     23
    2224    NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp
    2325
    … …  
    319321    UIProcess/mac/WebProcessProxyMac.mm
    320322    UIProcess/mac/WindowServerConnection.mm
    321 
    322     WebProcess/Cookies/mac/WebCookieManagerMac.mm
    323323
    324324    WebProcess/InjectedBundle/API/Cocoa/WKWebProcessBundleParameters.mm

  • trunk/Source/WebKit/PlatformWin.cmake

    r228567 r229426  
    108108
    109109    list(APPEND WebKit_SOURCES
     110        NetworkProcess/Cookies/curl/WebCookieManagerCurl.cpp
     111
    110112        NetworkProcess/cache/NetworkCacheCodersCurl.cpp
    111113        NetworkProcess/cache/NetworkCacheDataCurl.cpp
    … …  
    118120
    119121        Shared/curl/WebCoreArgumentCodersCurl.cpp
    120 
    121         WebProcess/Cookies/curl/WebCookieManagerCurl.cpp
    122122
    123123        WebProcess/WebCoreSupport/curl/WebFrameNetworkingContext.cpp

  • trunk/Source/WebKit/SourcesGTK.txt

    r229193 r229426  
    2525// linking PluginProcessGTK2. I don't know why this is necessary. These
    2626// annotations should be revisited after removing PluginProcessGTK2.
     27
     28NetworkProcess/Cookies/soup/WebCookieManagerSoup.cpp
    2729
    2830NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp
    … …  
    237239UIProcess/soup/WebCookieManagerProxySoup.cpp
    238240UIProcess/soup/WebProcessPoolSoup.cpp
    239 
    240 WebProcess/Cookies/soup/WebCookieManagerSoup.cpp
    241241
    242242WebProcess/InjectedBundle/glib/InjectedBundleGlib.cpp

  • trunk/Source/WebKit/SourcesWPE.txt

    r229193 r229426  
    2121// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
    2222// THE POSSIBILITY OF SUCH DAMAGE.
     23
     24NetworkProcess/Cookies/soup/WebCookieManagerSoup.cpp
    2325
    2426NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp
    … …  
    195197UIProcess/wpe/WebProcessPoolWPE.cpp
    196198
    197 WebProcess/Cookies/soup/WebCookieManagerSoup.cpp
    198 
    199199WebProcess/InjectedBundle/API/glib/WebKitConsoleMessage.cpp @no-unify
    200200WebProcess/InjectedBundle/API/glib/WebKitExtensionManager.cpp @no-unify

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r229421 r229426  
    58805880                        );
    58815881                        name = Cookies;
     5882                        path = NetworkProcess;
    58825883                        sourceTree = "<group>";
    58835884                };
    … …  
    63396340                                539BD5B21DADB0BA00F2E4E1 /* capture */,
    63406341                                7EC4F0F818E4A922008056AF /* cocoa */,
     6342                                3309344B1315B93A0097A7BC /* Cookies */,
    63416343                                5C1426F21C23F82D00D41183 /* CustomProtocols */,
    63426344                                5C1426F11C23F81700D41183 /* Downloads */,
    … …  
    70147016                                41D129D81F3D101400D15E47 /* Cache */,
    70157017                                7C6E70F818B2D47E00F24E2E /* cocoa */,
    7016                                 3309344B1315B93A0097A7BC /* Cookies */,
    70177018                                5760828A202984C900116678 /* CredentialManagement */,
    70187019                                512A9754180DF9270039A149 /* Databases */,

  • trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp

    r229334 r229426  
    3535#include "UserData.h"
    3636#include "WebConnectionToUIProcess.h"
    37 #include "WebCookieManager.h"
    3837#include "WebCoreArgumentCoders.h"
    3938#include "WebFrame.h"

  • trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp

    r229100 r229426  
    3636#include "PluginInfoStore.h"
    3737#include "SessionTracker.h"
    38 #include "WebCookieManager.h"
    3938#include "WebCoreArgumentCoders.h"
    4039#include "WebErrors.h"

  • trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm

    r227682 r229426  
    3030#include "NetworkSession.h"
    3131#include "SessionTracker.h"
    32 #include "WebCookieManager.h"
    3332#include "WebPage.h"
    3433#include "WebProcess.h"

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

    r229209 r229426  
    4949#include "WebCacheStorageProvider.h"
    5050#include "WebConnectionToUIProcess.h"
    51 #include "WebCookieManager.h"
    5251#include "WebCoreArgumentCoders.h"
    5352#include "WebFrame.h"
    … …  
    188187    // limited.
    189188    addSupplement<WebGeolocationManager>();
    190     addSupplement<WebCookieManager>();
    191189
    192190#if ENABLE(NOTIFICATIONS)
Note: See TracChangeset for help on using the changeset viewer.