Attachment #327991 for bug #176230

View Details Raw Unified Return to Bug 176230

| Differences between



2017-11-30  Stephan Szabo  <stephan.szabo@sony.com>

        Make LegacyCustomProtocolManager optional for network process
        https://bugs.webkit.org/show_bug.cgi?id=176230

        Reviewed by NOBODY (OOPS!).

        * Source/cmake/OptionsWin.cmake:
        * Source/cmake/WebKitFeatures.cmake:

2017-11-29  Alex Christensen  <achristensen@webkit.org>

        Fix Mac CMake build.



)

set(WebKit_SOURCES
    NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp

    NetworkProcess/Downloads/BlobDownloadClient.cpp
    NetworkProcess/Downloads/Download.cpp
    NetworkProcess/Downloads/DownloadManager.cpp


    UIProcess/Launcher/ProcessLauncher.cpp

    UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.cpp

    UIProcess/Network/NetworkProcessProxy.cpp

    UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp

)

set(WebKit_MESSAGES_IN_FILES
    NetworkProcess/cache/CacheStorageEngineConnection.messages.in

    NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.messages.in

    NetworkProcess/NetworkConnectionToWebProcess.messages.in
    NetworkProcess/NetworkProcess.messages.in
    NetworkProcess/NetworkResourceLoader.messages.in
    NetworkProcess/NetworkSocketStream.messages.in

    NetworkProcess/cache/CacheStorageEngineConnection.messages.in

    NetworkProcess/webrtc/NetworkRTCMonitor.messages.in
    NetworkProcess/webrtc/NetworkRTCProvider.messages.in
    NetworkProcess/webrtc/NetworkRTCSocket.messages.in


    UIProcess/Network/NetworkProcessProxy.messages.in

    UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.messages.in

    UIProcess/Plugins/PluginProcessProxy.messages.in

    UIProcess/Storage/StorageProcessProxy.messages.in



2017-11-30  Stephan Szabo  <stephan.szabo@sony.com>

        Make LegacyCustomProtocolManager optional for network process
        https://bugs.webkit.org/show_bug.cgi?id=176230

        Reviewed by NOBODY (OOPS!).

        * CMakeLists.txt:
        * NetworkProcess/NetworkProcess.cpp:
        (WebKit::NetworkProcess::NetworkProcess):
        (WebKit::NetworkProcess::initializeNetworkProcess):
        * PlatformGTK.cmake:
        * PlatformMac.cmake:
        * PlatformWPE.cmake:
        * UIProcess/Network/NetworkProcessProxy.cpp:
        (WebKit::NetworkProcessProxy::NetworkProcessProxy):
        (WebKit::NetworkProcessProxy::didClose):
        * UIProcess/Network/NetworkProcessProxy.h:
        * UIProcess/WebProcessPool.cpp:
        (WebKit::WebProcessPool::setLegacyCustomProtocolManagerClient):
        (WebKit::WebProcessPool::registerSchemeForCustomProtocol):
        (WebKit::WebProcessPool::unregisterSchemeForCustomProtocol):

2017-11-30  Zan Dobersek  <zdobersek@igalia.com>

        [CoordGraphics] Move CoordinatedGraphicsLayer painting behind Nicosia::PaintingEngine



#include "ChildProcessMessages.h"
#include "DataReference.h"
#include "DownloadProxyMessages.h"
#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
#include "LegacyCustomProtocolManager.h"
#endif
#include "Logging.h"
#include "NetworkConnectionToWebProcess.h"
#include "NetworkProcessCreationParameters.h"


    addSupplement<AuthenticationManager>();
    addSupplement<WebCookieManager>();
#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
    addSupplement<LegacyCustomProtocolManager>();
#endif
}

NetworkProcess::~NetworkProcess()

        NetworkStorageSession::switchToNewTestingSession();

#if USE(NETWORK_SESSION)
#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
    parameters.defaultSessionParameters.legacyCustomProtocolManager = supplement<LegacyCustomProtocolManager>();
#endif
    SessionTracker::setSession(PAL::SessionID::defaultSessionID(), NetworkSession::create(WTFMove(parameters.defaultSessionParameters)));
#endif


Lines 30-35 file(REMOVE "${FORWARDING_HEADERS_DIR}/WebCore/Settings.h") a/Source/WebKit/PlatformGTK.cmake_sec1
- a/Source/WebKit/PlatformGTK.cmake +10 lines
30	set(WebKit_USE_PREFIX_HEADER ON)	30	set(WebKit_USE_PREFIX_HEADER ON)
31		31
32	list(APPEND WebKit_SOURCES	32	list(APPEND WebKit_SOURCES
		33	NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp
		34
33	NetworkProcess/CustomProtocols/soup/LegacyCustomProtocolManagerSoup.cpp	35	NetworkProcess/CustomProtocols/soup/LegacyCustomProtocolManagerSoup.cpp
34		36
35	NetworkProcess/cache/NetworkCacheCodersSoup.cpp	37	NetworkProcess/cache/NetworkCacheCodersSoup.cpp
Lines 200-205 list(APPEND WebKit_SOURCES a/Source/WebKit/PlatformGTK.cmake_sec2
200		202
201	UIProcess/Launcher/glib/ProcessLauncherGLib.cpp	203	UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
202		204
		205	UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.cpp
		206
203	UIProcess/linux/MemoryPressureMonitor.cpp	207	UIProcess/linux/MemoryPressureMonitor.cpp
204		208
205	UIProcess/Plugins/gtk/PluginInfoCache.cpp	209	UIProcess/Plugins/gtk/PluginInfoCache.cpp
Lines 408-413 list(APPEND WebKit_SOURCES a/Source/WebKit/PlatformGTK.cmake_sec3
408	WebProcess/soup/WebProcessSoup.cpp	412	WebProcess/soup/WebProcessSoup.cpp
409	)	413	)
410		414
		415	list(APPEND WebKit_MESSAGES_IN_FILES
		416	NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.messages.in
		417
		418	UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.messages.in
		419	)
		420
411	list(APPEND WebKit_DERIVED_SOURCES	421	list(APPEND WebKit_DERIVED_SOURCES
412	${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c	422	${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c
413	${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitResourcesGResourceBundle.c	423	${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitResourcesGResourceBundle.c

Lines 19-24 if (NOT AVFAUDIO_LIBRARY-NOTFOUND) a/Source/WebKit/PlatformMac.cmake_sec1
- a/Source/WebKit/PlatformMac.cmake +8 lines
19	endif ()	19	endif ()
20		20
21	list(APPEND WebKit_SOURCES	21	list(APPEND WebKit_SOURCES
		22	NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp
		23
22	NetworkProcess/CustomProtocols/Cocoa/LegacyCustomProtocolManagerCocoa.mm	24	NetworkProcess/CustomProtocols/Cocoa/LegacyCustomProtocolManagerCocoa.mm
23		25
24	NetworkProcess/Downloads/PendingDownload.cpp	26	NetworkProcess/Downloads/PendingDownload.cpp
Lines 274-279 list(APPEND WebKit_SOURCES a/Source/WebKit/PlatformMac.cmake_sec2
274		276
275	UIProcess/Launcher/mac/ProcessLauncherMac.mm	277	UIProcess/Launcher/mac/ProcessLauncherMac.mm
276		278
		279	UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.cpp
		280
277	UIProcess/Network/mac/NetworkProcessProxyMac.mm	281	UIProcess/Network/mac/NetworkProcessProxyMac.mm
278		282
279	UIProcess/Plugins/mac/PluginInfoStoreMac.mm	283	UIProcess/Plugins/mac/PluginInfoStoreMac.mm
Lines 480-490 set(WebKit_FORWARDING_HEADERS_FILES a/Source/WebKit/PlatformMac.cmake_sec3
480	)	484	)
481		485
482	list(APPEND WebKit_MESSAGES_IN_FILES	486	list(APPEND WebKit_MESSAGES_IN_FILES
		487	NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.messages.in
		488
483	Shared/API/Cocoa/RemoteObjectRegistry.messages.in	489	Shared/API/Cocoa/RemoteObjectRegistry.messages.in
484		490
485	UIProcess/Cocoa/VideoFullscreenManagerProxy.messages.in	491	UIProcess/Cocoa/VideoFullscreenManagerProxy.messages.in
486	UIProcess/Cocoa/ViewGestureController.messages.in	492	UIProcess/Cocoa/ViewGestureController.messages.in
487		493
		494	UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.messages.in
		495
488	UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.messages.in	496	UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.messages.in
489		497
490	UIProcess/mac/SecItemShimProxy.messages.in	498	UIProcess/mac/SecItemShimProxy.messages.in

Lines 61-66 list(APPEND StorageProcess_SOURCES a/Source/WebKit/PlatformWPE.cmake_sec1
- a/Source/WebKit/PlatformWPE.cmake +8 lines
61	)	61	)
62		62
63	list(APPEND WebKit_SOURCES	63	list(APPEND WebKit_SOURCES
		64	NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp
		65
64	NetworkProcess/CustomProtocols/soup/LegacyCustomProtocolManagerSoup.cpp	66	NetworkProcess/CustomProtocols/soup/LegacyCustomProtocolManagerSoup.cpp
65		67
66	NetworkProcess/cache/NetworkCacheCodersSoup.cpp	68	NetworkProcess/cache/NetworkCacheCodersSoup.cpp
Lines 209-214 list(APPEND WebKit_SOURCES a/Source/WebKit/PlatformWPE.cmake_sec2
209		211
210	UIProcess/Launcher/glib/ProcessLauncherGLib.cpp	212	UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
211		213
		214	UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.cpp
		215
212	UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp	216	UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp
213	UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp	217	UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp
214		218
Lines 276-282 list(APPEND WebKit_SOURCES a/Source/WebKit/PlatformWPE.cmake_sec3
276	)	280	)
277		281
278	list(APPEND WebKit_MESSAGES_IN_FILES	282	list(APPEND WebKit_MESSAGES_IN_FILES
		283	NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.messages.in
		284
279	UIProcess/API/wpe/CompositingManagerProxy.messages.in	285	UIProcess/API/wpe/CompositingManagerProxy.messages.in
		286
		287	UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.messages.in
280	)	288	)
281		289
282	list(APPEND WebKit_DERIVED_SOURCES	290	list(APPEND WebKit_DERIVED_SOURCES




#include "AuthenticationChallengeProxy.h"
#include "DownloadProxyMessages.h"
#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
#include "LegacyCustomProtocolManagerProxyMessages.h"
#endif
#include "Logging.h"
#include "NetworkProcessCreationParameters.h"
#include "NetworkProcessMessages.h"

    : ChildProcessProxy(processPool.alwaysRunsAtBackgroundPriority())
    , m_processPool(processPool)
    , m_numPendingConnectionRequests(0)
#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
    , m_customProtocolManagerProxy(*this)
#endif
    , m_throttler(*this, processPool.shouldTakeUIBackgroundAssertion())
{
    connect();

{
    if (m_downloadProxyMap)
        m_downloadProxyMap->processDidClose();
#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
    m_customProtocolManagerProxy.invalidate();
#endif

    m_tokenForHoldingLockedFiles = nullptr;




#define NetworkProcessProxy_h

#include "ChildProcessProxy.h"
#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
#include "LegacyCustomProtocolManagerProxy.h"
#endif
#include "ProcessLauncher.h"
#include "ProcessThrottler.h"
#include "ProcessThrottlerClient.h"

    HashMap<uint64_t, WTF::Function<void ()>> m_pendingDeleteWebsiteDataForOriginsCallbacks;

    std::unique_ptr<DownloadProxyMap> m_downloadProxyMap;
#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
    LegacyCustomProtocolManagerProxy m_customProtocolManagerProxy;
#endif
    ProcessThrottler m_throttler;
    ProcessThrottler::BackgroundActivityToken m_tokenForHoldingLockedFiles;




#include "DownloadProxyMessages.h"
#include "GamepadData.h"
#include "HighPerformanceGraphicsUsageSampler.h"
#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
#include "LegacyCustomProtocolManagerMessages.h"
#endif
#include "LogInitialization.h"
#include "NetworkProcessCreationParameters.h"
#include "NetworkProcessMessages.h"


void WebProcessPool::setLegacyCustomProtocolManagerClient(std::unique_ptr<API::CustomProtocolManagerClient>&& customProtocolManagerClient)
{
#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
    if (!customProtocolManagerClient)
        m_customProtocolManagerClient = std::make_unique<API::CustomProtocolManagerClient>();
    else
        m_customProtocolManagerClient = WTFMove(customProtocolManagerClient);
#endif
}

void WebProcessPool::setMaximumNumberOfProcesses(unsigned maximumNumberOfProcesses)


void WebProcessPool::registerSchemeForCustomProtocol(const String& scheme)
{
#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
    if (!globalURLSchemesWithCustomProtocolHandlers().contains(scheme))
        m_urlSchemesRegisteredForCustomProtocols.add(scheme);
    sendToNetworkingProcess(Messages::LegacyCustomProtocolManager::RegisterScheme(scheme));
#endif
}

void WebProcessPool::unregisterSchemeForCustomProtocol(const String& scheme)
{
#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
    m_urlSchemesRegisteredForCustomProtocols.remove(scheme);
    sendToNetworkingProcess(Messages::LegacyCustomProtocolManager::UnregisterScheme(scheme));
#endif
}

#if ENABLE(NETSCAPE_PLUGIN_API)

Lines 78-83 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CRYPTO PRIVATE OFF) a/Source/cmake/OptionsWin.cmake_sec1
- a/Source/cmake/OptionsWin.cmake +1 lines
78	WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_MALLOC PRIVATE ON)	78	WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_MALLOC PRIVATE ON)
79		79
80	if (${WTF_PLATFORM_WIN_CAIRO})	80	if (${WTF_PLATFORM_WIN_CAIRO})
		81	WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER PUBLIC OFF)
81	WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_ENCRYPTED_MEDIA PUBLIC OFF)	82	WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_ENCRYPTED_MEDIA PUBLIC OFF)
82	WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTL PUBLIC ON)	83	WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTL PUBLIC ON)
83	WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PUBLIC ON)	84	WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PUBLIC ON)

Lines 127-132 macro(WEBKIT_OPTION_BEGIN) a/Source/cmake/WebKitFeatures.cmake_sec1
- a/Source/cmake/WebKitFeatures.cmake +1 lines
127	WEBKIT_OPTION_DEFINE(ENABLE_INTL "Toggle Intl support" PRIVATE ON)	127	WEBKIT_OPTION_DEFINE(ENABLE_INTL "Toggle Intl support" PRIVATE ON)
128	WEBKIT_OPTION_DEFINE(ENABLE_IOS_AIRPLAY "Toggle iOS airplay support" PRIVATE OFF)	128	WEBKIT_OPTION_DEFINE(ENABLE_IOS_AIRPLAY "Toggle iOS airplay support" PRIVATE OFF)
129	WEBKIT_OPTION_DEFINE(ENABLE_JIT "Enable JustInTime javascript support" PRIVATE ON)	129	WEBKIT_OPTION_DEFINE(ENABLE_JIT "Enable JustInTime javascript support" PRIVATE ON)
		130	WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER "Toggle legacy protocol manager support" PRIVATE ON)
130	WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_CSS_VENDOR_PREFIXES "Toggle legacy css vendor prefix support" PRIVATE OFF)	131	WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_CSS_VENDOR_PREFIXES "Toggle legacy css vendor prefix support" PRIVATE OFF)
131	WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_ENCRYPTED_MEDIA "Support legacy EME" PRIVATE OFF)	132	WEBKIT_OPTION_DEFINE(ENABLE_LEGACY_ENCRYPTED_MEDIA "Support legacy EME" PRIVATE OFF)
132	WEBKIT_OPTION_DEFINE(ENABLE_LETTERPRESS "Toggle letterpress support" PRIVATE OFF)	133	WEBKIT_OPTION_DEFINE(ENABLE_LETTERPRESS "Toggle letterpress support" PRIVATE OFF)

Return to Bug 176230

Lines 96-103 set(WebKit_SYSTEM_INCLUDE_DIRECTORIES a/Source/WebKit/CMakeLists.txt_sec1
- a/Source/WebKit/CMakeLists.txt -10 / +2 lines
96	)	96	)
97		97
98	set(WebKit_SOURCES	98	set(WebKit_SOURCES
99	NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.cpp
100
101	NetworkProcess/Downloads/BlobDownloadClient.cpp	99	NetworkProcess/Downloads/BlobDownloadClient.cpp
102	NetworkProcess/Downloads/Download.cpp	100	NetworkProcess/Downloads/Download.cpp
103	NetworkProcess/Downloads/DownloadManager.cpp	101	NetworkProcess/Downloads/DownloadManager.cpp
Lines 424-431 set(WebKit_SOURCES a/Source/WebKit/CMakeLists.txt_sec2
424		422
425	UIProcess/Launcher/ProcessLauncher.cpp	423	UIProcess/Launcher/ProcessLauncher.cpp
426		424
427	UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.cpp
428
429	UIProcess/Network/NetworkProcessProxy.cpp	425	UIProcess/Network/NetworkProcessProxy.cpp
430		426
431	UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp	427	UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp
Lines 598-612 set(WebKit_SOURCES a/Source/WebKit/CMakeLists.txt_sec3
598	)	594	)
599		595
600	set(WebKit_MESSAGES_IN_FILES	596	set(WebKit_MESSAGES_IN_FILES
601	NetworkProcess/cache/CacheStorageEngineConnection.messages.in
602
603	NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.messages.in
604
605	NetworkProcess/NetworkConnectionToWebProcess.messages.in	597	NetworkProcess/NetworkConnectionToWebProcess.messages.in
606	NetworkProcess/NetworkProcess.messages.in	598	NetworkProcess/NetworkProcess.messages.in
607	NetworkProcess/NetworkResourceLoader.messages.in	599	NetworkProcess/NetworkResourceLoader.messages.in
608	NetworkProcess/NetworkSocketStream.messages.in	600	NetworkProcess/NetworkSocketStream.messages.in
609		601
		602	NetworkProcess/cache/CacheStorageEngineConnection.messages.in
		603
610	NetworkProcess/webrtc/NetworkRTCMonitor.messages.in	604	NetworkProcess/webrtc/NetworkRTCMonitor.messages.in
611	NetworkProcess/webrtc/NetworkRTCProvider.messages.in	605	NetworkProcess/webrtc/NetworkRTCProvider.messages.in
612	NetworkProcess/webrtc/NetworkRTCSocket.messages.in	606	NetworkProcess/webrtc/NetworkRTCSocket.messages.in
Lines 648-655 set(WebKit_MESSAGES_IN_FILES a/Source/WebKit/CMakeLists.txt_sec4
648		642
649	UIProcess/Network/NetworkProcessProxy.messages.in	643	UIProcess/Network/NetworkProcessProxy.messages.in
650		644
651	UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.messages.in
652
653	UIProcess/Plugins/PluginProcessProxy.messages.in	645	UIProcess/Plugins/PluginProcessProxy.messages.in
654		646
655	UIProcess/Storage/StorageProcessProxy.messages.in	647	UIProcess/Storage/StorageProcessProxy.messages.in

Lines 1-3 a/ChangeLog_sec1
- a/ChangeLog +10 lines
		1	2017-11-30 Stephan Szabo <stephan.szabo@sony.com>
		2
		3	Make LegacyCustomProtocolManager optional for network process
		4	https://bugs.webkit.org/show_bug.cgi?id=176230
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* Source/cmake/OptionsWin.cmake:
		9	* Source/cmake/WebKitFeatures.cmake:
		10
1	2017-11-29 Alex Christensen <achristensen@webkit.org>	11	2017-11-29 Alex Christensen <achristensen@webkit.org>
2		12
3	Fix Mac CMake build.	13	Fix Mac CMake build.

Lines 1-3 a/Source/WebKit/ChangeLog_sec1
- a/Source/WebKit/ChangeLog +23 lines
		1	2017-11-30 Stephan Szabo <stephan.szabo@sony.com>
		2
		3	Make LegacyCustomProtocolManager optional for network process
		4	https://bugs.webkit.org/show_bug.cgi?id=176230
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* CMakeLists.txt:
		9	* NetworkProcess/NetworkProcess.cpp:
		10	(WebKit::NetworkProcess::NetworkProcess):
		11	(WebKit::NetworkProcess::initializeNetworkProcess):
		12	* PlatformGTK.cmake:
		13	* PlatformMac.cmake:
		14	* PlatformWPE.cmake:
		15	* UIProcess/Network/NetworkProcessProxy.cpp:
		16	(WebKit::NetworkProcessProxy::NetworkProcessProxy):
		17	(WebKit::NetworkProcessProxy::didClose):
		18	* UIProcess/Network/NetworkProcessProxy.h:
		19	* UIProcess/WebProcessPool.cpp:
		20	(WebKit::WebProcessPool::setLegacyCustomProtocolManagerClient):
		21	(WebKit::WebProcessPool::registerSchemeForCustomProtocol):
		22	(WebKit::WebProcessPool::unregisterSchemeForCustomProtocol):
		23
1	2017-11-30 Zan Dobersek <zdobersek@igalia.com>	24	2017-11-30 Zan Dobersek <zdobersek@igalia.com>
2		25
3	[CoordGraphics] Move CoordinatedGraphicsLayer painting behind Nicosia::PaintingEngine	26	[CoordGraphics] Move CoordinatedGraphicsLayer painting behind Nicosia::PaintingEngine

Lines 32-38 a/Source/WebKit/NetworkProcess/NetworkProcess.cpp_sec1
- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp +6 lines
32	#include "ChildProcessMessages.h"	32	#include "ChildProcessMessages.h"
33	#include "DataReference.h"	33	#include "DataReference.h"
34	#include "DownloadProxyMessages.h"	34	#include "DownloadProxyMessages.h"
		35	#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
35	#include "LegacyCustomProtocolManager.h"	36	#include "LegacyCustomProtocolManager.h"
		37	#endif
36	#include "Logging.h"	38	#include "Logging.h"
37	#include "NetworkConnectionToWebProcess.h"	39	#include "NetworkConnectionToWebProcess.h"
38	#include "NetworkProcessCreationParameters.h"	40	#include "NetworkProcessCreationParameters.h"
Lines 114-120 NetworkProcess::NetworkProcess() a/Source/WebKit/NetworkProcess/NetworkProcess.cpp_sec2
114		116
115	addSupplement<AuthenticationManager>();	117	addSupplement<AuthenticationManager>();
116	addSupplement<WebCookieManager>();	118	addSupplement<WebCookieManager>();
		119	#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
117	addSupplement<LegacyCustomProtocolManager>();	120	addSupplement<LegacyCustomProtocolManager>();
		121	#endif
118	}	122	}
119		123
120	NetworkProcess::~NetworkProcess()	124	NetworkProcess::~NetworkProcess()
Lines 244-250 void NetworkProcess::initializeNetworkProcess(NetworkProcessCreationParameters&& a/Source/WebKit/NetworkProcess/NetworkProcess.cpp_sec3
244	NetworkStorageSession::switchToNewTestingSession();	248	NetworkStorageSession::switchToNewTestingSession();
245		249
246	#if USE(NETWORK_SESSION)	250	#if USE(NETWORK_SESSION)
		251	#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
247	parameters.defaultSessionParameters.legacyCustomProtocolManager = supplement<LegacyCustomProtocolManager>();	252	parameters.defaultSessionParameters.legacyCustomProtocolManager = supplement<LegacyCustomProtocolManager>();
		253	#endif
248	SessionTracker::setSession(PAL::SessionID::defaultSessionID(), NetworkSession::create(WTFMove(parameters.defaultSessionParameters)));	254	SessionTracker::setSession(PAL::SessionID::defaultSessionID(), NetworkSession::create(WTFMove(parameters.defaultSessionParameters)));
249	#endif	255	#endif
250		256

Lines 28-34 a/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp_sec1
- a/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp +6 lines
28		28
29	#include "AuthenticationChallengeProxy.h"	29	#include "AuthenticationChallengeProxy.h"
30	#include "DownloadProxyMessages.h"	30	#include "DownloadProxyMessages.h"
		31	#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
31	#include "LegacyCustomProtocolManagerProxyMessages.h"	32	#include "LegacyCustomProtocolManagerProxyMessages.h"
		33	#endif
32	#include "Logging.h"	34	#include "Logging.h"
33	#include "NetworkProcessCreationParameters.h"	35	#include "NetworkProcessCreationParameters.h"
34	#include "NetworkProcessMessages.h"	36	#include "NetworkProcessMessages.h"
Lines 70-76 NetworkProcessProxy::NetworkProcessProxy(WebProcessPool& processPool) a/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp_sec2
70	: ChildProcessProxy(processPool.alwaysRunsAtBackgroundPriority())	72	: ChildProcessProxy(processPool.alwaysRunsAtBackgroundPriority())
71	, m_processPool(processPool)	73	, m_processPool(processPool)
72	, m_numPendingConnectionRequests(0)	74	, m_numPendingConnectionRequests(0)
		75	#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
73	, m_customProtocolManagerProxy(*this)	76	, m_customProtocolManagerProxy(*this)
		77	#endif
74	, m_throttler(*this, processPool.shouldTakeUIBackgroundAssertion())	78	, m_throttler(*this, processPool.shouldTakeUIBackgroundAssertion())
75	{	79	{
76	connect();	80	connect();
Lines 235-241 void NetworkProcessProxy::didClose(IPC::Connection&) a/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp_sec3
235	{	239	{
236	if (m_downloadProxyMap)	240	if (m_downloadProxyMap)
237	m_downloadProxyMap->processDidClose();	241	m_downloadProxyMap->processDidClose();
		242	#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
238	m_customProtocolManagerProxy.invalidate();	243	m_customProtocolManagerProxy.invalidate();
		244	#endif
239		245
240	m_tokenForHoldingLockedFiles = nullptr;	246	m_tokenForHoldingLockedFiles = nullptr;
241		247

Lines 27-33 a/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h_sec1
- a/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h +4 lines
27	#define NetworkProcessProxy_h	27	#define NetworkProcessProxy_h
28		28
29	#include "ChildProcessProxy.h"	29	#include "ChildProcessProxy.h"
		30	#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
30	#include "LegacyCustomProtocolManagerProxy.h"	31	#include "LegacyCustomProtocolManagerProxy.h"
		32	#endif
31	#include "ProcessLauncher.h"	33	#include "ProcessLauncher.h"
32	#include "ProcessThrottler.h"	34	#include "ProcessThrottler.h"
33	#include "ProcessThrottlerClient.h"	35	#include "ProcessThrottlerClient.h"
Lines 142-148 private: a/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h_sec2
142	HashMap<uint64_t, WTF::Function<void ()>> m_pendingDeleteWebsiteDataForOriginsCallbacks;	144	HashMap<uint64_t, WTF::Function<void ()>> m_pendingDeleteWebsiteDataForOriginsCallbacks;
143		145
144	std::unique_ptr<DownloadProxyMap> m_downloadProxyMap;	146	std::unique_ptr<DownloadProxyMap> m_downloadProxyMap;
		147	#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
145	LegacyCustomProtocolManagerProxy m_customProtocolManagerProxy;	148	LegacyCustomProtocolManagerProxy m_customProtocolManagerProxy;
		149	#endif
146	ProcessThrottler m_throttler;	150	ProcessThrottler m_throttler;
147	ProcessThrottler::BackgroundActivityToken m_tokenForHoldingLockedFiles;	151	ProcessThrottler::BackgroundActivityToken m_tokenForHoldingLockedFiles;
148		152

Lines 39-45 a/Source/WebKit/UIProcess/WebProcessPool.cpp_sec1
- a/Source/WebKit/UIProcess/WebProcessPool.cpp +8 lines
39	#include "DownloadProxyMessages.h"	39	#include "DownloadProxyMessages.h"
40	#include "GamepadData.h"	40	#include "GamepadData.h"
41	#include "HighPerformanceGraphicsUsageSampler.h"	41	#include "HighPerformanceGraphicsUsageSampler.h"
		42	#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
42	#include "LegacyCustomProtocolManagerMessages.h"	43	#include "LegacyCustomProtocolManagerMessages.h"
		44	#endif
43	#include "LogInitialization.h"	45	#include "LogInitialization.h"
44	#include "NetworkProcessCreationParameters.h"	46	#include "NetworkProcessCreationParameters.h"
45	#include "NetworkProcessMessages.h"	47	#include "NetworkProcessMessages.h"
Lines 366-375 void WebProcessPool::setAutomationClient(std::unique_ptr<API::AutomationClient>& a/Source/WebKit/UIProcess/WebProcessPool.cpp_sec2
366		368
367	void WebProcessPool::setLegacyCustomProtocolManagerClient(std::unique_ptr<API::CustomProtocolManagerClient>&& customProtocolManagerClient)	369	void WebProcessPool::setLegacyCustomProtocolManagerClient(std::unique_ptr<API::CustomProtocolManagerClient>&& customProtocolManagerClient)
368	{	370	{
		371	#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
369	if (!customProtocolManagerClient)	372	if (!customProtocolManagerClient)
370	m_customProtocolManagerClient = std::make_unique<API::CustomProtocolManagerClient>();	373	m_customProtocolManagerClient = std::make_unique<API::CustomProtocolManagerClient>();
371	else	374	else
372	m_customProtocolManagerClient = WTFMove(customProtocolManagerClient);	375	m_customProtocolManagerClient = WTFMove(customProtocolManagerClient);
		376	#endif
373	}	377	}
374		378
375	void WebProcessPool::setMaximumNumberOfProcesses(unsigned maximumNumberOfProcesses)	379	void WebProcessPool::setMaximumNumberOfProcesses(unsigned maximumNumberOfProcesses)
Lines 1638-1652 void WebProcessPool::setPlugInAutoStartOriginsFilteringOutEntriesAddedAfterTime( a/Source/WebKit/UIProcess/WebProcessPool.cpp_sec3
1638		1642
1639	void WebProcessPool::registerSchemeForCustomProtocol(const String& scheme)	1643	void WebProcessPool::registerSchemeForCustomProtocol(const String& scheme)
1640	{	1644	{
		1645	#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
1641	if (!globalURLSchemesWithCustomProtocolHandlers().contains(scheme))	1646	if (!globalURLSchemesWithCustomProtocolHandlers().contains(scheme))
1642	m_urlSchemesRegisteredForCustomProtocols.add(scheme);	1647	m_urlSchemesRegisteredForCustomProtocols.add(scheme);
1643	sendToNetworkingProcess(Messages::LegacyCustomProtocolManager::RegisterScheme(scheme));	1648	sendToNetworkingProcess(Messages::LegacyCustomProtocolManager::RegisterScheme(scheme));
		1649	#endif
1644	}	1650	}
1645		1651
1646	void WebProcessPool::unregisterSchemeForCustomProtocol(const String& scheme)	1652	void WebProcessPool::unregisterSchemeForCustomProtocol(const String& scheme)
1647	{	1653	{
		1654	#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
1648	m_urlSchemesRegisteredForCustomProtocols.remove(scheme);	1655	m_urlSchemesRegisteredForCustomProtocols.remove(scheme);
1649	sendToNetworkingProcess(Messages::LegacyCustomProtocolManager::UnregisterScheme(scheme));	1656	sendToNetworkingProcess(Messages::LegacyCustomProtocolManager::UnregisterScheme(scheme));
		1657	#endif
1650	}	1658	}
1651		1659
1652	#if ENABLE(NETSCAPE_PLUGIN_API)	1660	#if ENABLE(NETSCAPE_PLUGIN_API)