Attachment 361159 Details for Bug 194278 – Patch

[patch] Patch

bug-194278-20190204223356.patch (text/plain), 12.88 KB, created by Alex Christensen on 2019-02-04 22:33:57 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-02-04 22:33:57 PST

Size: 12.88 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 240965)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,27 @@
>+2019-02-04  Alex Christensen  <achristensen@webkit.org>
>+
>+        Add Networking Daemon skeleton
>+        https://bugs.webkit.org/show_bug.cgi?id=194278
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Daemon skeletons? This is spooky stuff.
>+
>+        * NetworkProcess/EntryPoint/Cocoa/Daemon/DaemonEntryPoint.h: Added.
>+        * NetworkProcess/EntryPoint/Cocoa/Daemon/DaemonEntryPoint.mm: Added.
>+        (WebKit::DaemonMain):
>+        * NetworkProcess/cocoa/NetworkDataTaskCocoa.h:
>+        * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
>+        (WebKit::NetworkDataTaskCocoa::restrictRequestReferrerToOriginIfNeeded):
>+        * Shared/API/Cocoa/WKMain.h:
>+        * Shared/API/Cocoa/WKMain.mm:
>+        (WKDaemonMain):
>+        * Shared/EntryPointUtilities/Cocoa/AuxiliaryProcessMain.cpp:
>+        (main):
>+        * SourcesCocoa.txt:
>+        * UnifiedSources-input.xcfilelist:
>+        * WebKit.xcodeproj/project.pbxproj:
>+
> 2019-02-04  Yusuke Suzuki  <ysuzuki@apple.com>
> 
>         [JSC] Shrink size of VM by lazily allocating IsoSubspaces for non-common types
>Index: Source/WebKit/SourcesCocoa.txt
>===================================================================
>--- Source/WebKit/SourcesCocoa.txt	(revision 240959)
>+++ Source/WebKit/SourcesCocoa.txt	(working copy)
>@@ -39,6 +39,7 @@ NetworkProcess/CustomProtocols/LegacyCus
> 
> NetworkProcess/Downloads/cocoa/DownloadCocoa.mm
> 
>+NetworkProcess/EntryPoint/Cocoa/Daemon/DaemonEntryPoint.mm
> NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkServiceEntryPoint.mm
> 
> NetworkProcess/ios/NetworkProcessIOS.mm
>Index: Source/WebKit/UnifiedSources-input.xcfilelist
>===================================================================
>--- Source/WebKit/UnifiedSources-input.xcfilelist	(revision 240959)
>+++ Source/WebKit/UnifiedSources-input.xcfilelist	(working copy)
>@@ -12,7 +12,8 @@ $(SRCROOT)/NetworkProcess/Downloads/Down
> $(SRCROOT)/NetworkProcess/Downloads/DownloadManager.cpp
> $(SRCROOT)/NetworkProcess/Downloads/PendingDownload.cpp
> $(SRCROOT)/NetworkProcess/Downloads/cocoa/DownloadCocoa.mm
>-$(SRCROOT)/NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm
>+$(SRCROOT)/NetworkProcess/EntryPoint/Cocoa/Daemon/DaemonEntryPoint.mm
>+$(SRCROOT)/NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkServiceEntryPoint.mm
> $(SRCROOT)/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp
> $(SRCROOT)/NetworkProcess/IndexedDB/WebIDBConnectionToClient.cpp
> $(SRCROOT)/NetworkProcess/NetworkActivityTracker.cpp
>Index: Source/WebKit/NetworkProcess/EntryPoint/Cocoa/Daemon/DaemonEntryPoint.h
>===================================================================
>--- Source/WebKit/NetworkProcess/EntryPoint/Cocoa/Daemon/DaemonEntryPoint.h	(nonexistent)
>+++ Source/WebKit/NetworkProcess/EntryPoint/Cocoa/Daemon/DaemonEntryPoint.h	(working copy)
>@@ -0,0 +1,32 @@
>+/*
>+ * Copyright (C) 2019 Apple Inc. All rights reserved.
>+ *
>+ * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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.
>+ */
>+
>+#pragma once
>+
>+namespace WebKit {
>+
>+int DaemonMain(int, const char**);
>+
>+}
>Index: Source/WebKit/NetworkProcess/EntryPoint/Cocoa/Daemon/DaemonEntryPoint.mm
>===================================================================
>--- Source/WebKit/NetworkProcess/EntryPoint/Cocoa/Daemon/DaemonEntryPoint.mm	(nonexistent)
>+++ Source/WebKit/NetworkProcess/EntryPoint/Cocoa/Daemon/DaemonEntryPoint.mm	(working copy)
>@@ -0,0 +1,36 @@
>+/*
>+ * Copyright (C) 2019 Apple Inc. All rights reserved.
>+ *
>+ * 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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.
>+ */
>+
>+#import "config.h"
>+#import "DaemonEntryPoint.h"
>+
>+namespace WebKit {
>+
>+int DaemonMain(int, const char**)
>+{
>+    return 0;
>+}
>+
>+}
>Index: Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h
>===================================================================
>--- Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h	(revision 240959)
>+++ Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h	(working copy)
>@@ -37,6 +37,7 @@ OBJC_CLASS NSURLSessionDataTask;
> 
> namespace WebKit {
> 
>+class Download;
> class NetworkSessionCocoa;
> 
> class NetworkDataTaskCocoa final : public NetworkDataTask {
>Index: Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm
>===================================================================
>--- Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm	(revision 240959)
>+++ Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm	(working copy)
>@@ -263,7 +263,7 @@ NetworkDataTaskCocoa::~NetworkDataTaskCo
>     }
> }
> 
>-void NetworkDataTaskCocoa::restrictRequestReferrerToOriginIfNeeded(ResourceRequest& request, bool shouldBlockCookies)
>+void NetworkDataTaskCocoa::restrictRequestReferrerToOriginIfNeeded(WebCore::ResourceRequest& request, bool shouldBlockCookies)
> {
>     if (shouldBlockCookies || (m_session->sessionID().isEphemeral() && isThirdPartyRequest(request)))
>         request.setExistingHTTPReferrerToOriginString();
>Index: Source/WebKit/Shared/API/Cocoa/WKMain.h
>===================================================================
>--- Source/WebKit/Shared/API/Cocoa/WKMain.h	(revision 240959)
>+++ Source/WebKit/Shared/API/Cocoa/WKMain.h	(working copy)
>@@ -33,6 +33,7 @@ extern "C" {
> #endif
> 
> WK_EXPORT int WKXPCServiceMain(int argc, const char** argv) WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
>+WK_EXPORT int WKDaemonMain(int argc, const char** argv) WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
> 
> #ifdef __cplusplus
> }
>Index: Source/WebKit/Shared/API/Cocoa/WKMain.mm
>===================================================================
>--- Source/WebKit/Shared/API/Cocoa/WKMain.mm	(revision 240959)
>+++ Source/WebKit/Shared/API/Cocoa/WKMain.mm	(working copy)
>@@ -26,9 +26,15 @@
> #include "config.h"
> #include "WKMain.h"
> 
>+#include "DaemonEntryPoint.h"
> #include "XPCServiceEntryPoint.h"
> 
> int WKXPCServiceMain(int argc, const char** argv)
> {
>     return WebKit::XPCServiceMain(argc, argv);
> }
>+
>+int WKDaemonMain(int argc, const char** argv)
>+{
>+    return WebKit::DaemonMain(argc, argv);
>+}
>Index: Source/WebKit/Shared/EntryPointUtilities/Cocoa/AuxiliaryProcessMain.cpp
>===================================================================
>--- Source/WebKit/Shared/EntryPointUtilities/Cocoa/AuxiliaryProcessMain.cpp	(revision 240959)
>+++ Source/WebKit/Shared/EntryPointUtilities/Cocoa/AuxiliaryProcessMain.cpp	(working copy)
>@@ -27,5 +27,7 @@
> 
> int main(int argc, const char** argv)
> {
>+    if (argc >= 2 && strstr(argv[1], "Daemon"))
>+        return WKDaemonMain(argc, argv);
>     return WKXPCServiceMain(argc, argv);
> }
>Index: Source/WebKit/WebKit.xcodeproj/project.pbxproj
>===================================================================
>--- Source/WebKit/WebKit.xcodeproj/project.pbxproj	(revision 240959)
>+++ Source/WebKit/WebKit.xcodeproj/project.pbxproj	(working copy)
>@@ -1310,7 +1310,7 @@
> 		A55BA8351BA3E70A007CD33D /* WebInspectorFrontendAPIDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = A55BA8331BA3E6FA007CD33D /* WebInspectorFrontendAPIDispatcher.h */; };
> 		A58B6F0818FCA733008CBA53 /* WKFileUploadPanel.h in Headers */ = {isa = PBXBuildFile; fileRef = A58B6F0618FCA733008CBA53 /* WKFileUploadPanel.h */; };
> 		A5C0F0A72000654D00536536 /* _WKNSWindowExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = A5C0F0A62000654400536536 /* _WKNSWindowExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		A5C0F0AB2000658200536536 /* WKInspectorWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = A5C0F0AA2000656E00536536 /* _WKInspectorWindow.h */; settings = {ATTRIBUTES = (Private, ); }; };
>+		A5C0F0AB2000658200536536 /* _WKInspectorWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = A5C0F0AA2000656E00536536 /* _WKInspectorWindow.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		A5E391FD2183C1F800C8FB31 /* InspectorTargetProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = A5E391FC2183C1E900C8FB31 /* InspectorTargetProxy.h */; };
> 		A5EC6AD42151BD7B00677D17 /* WebPageDebuggable.h in Headers */ = {isa = PBXBuildFile; fileRef = A5EC6AD32151BD6900677D17 /* WebPageDebuggable.h */; };
> 		A5EFD38C16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = A5EFD38B16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -3449,6 +3449,8 @@
> 		5C5CEC2E2209114800D6BBB0 /* WKMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMain.h; sourceTree = "<group>"; };
> 		5C5CEC2F2209117E00D6BBB0 /* WKMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKMain.mm; sourceTree = "<group>"; };
> 		5C5CEC31220912AF00D6BBB0 /* AuxiliaryProcessMain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AuxiliaryProcessMain.cpp; path = Cocoa/AuxiliaryProcessMain.cpp; sourceTree = "<group>"; };
>+		5C5CEC382209583200D6BBB0 /* DaemonEntryPoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DaemonEntryPoint.h; sourceTree = "<group>"; };
>+		5C5CEC392209583200D6BBB0 /* DaemonEntryPoint.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DaemonEntryPoint.mm; sourceTree = "<group>"; };
> 		5C62FDF81EFC263C00CE072E /* WKURLSchemeTaskPrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKURLSchemeTaskPrivate.h; sourceTree = "<group>"; };
> 		5C6CE6D01F59BC460007C6CB /* PageClientImplCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PageClientImplCocoa.mm; sourceTree = "<group>"; };
> 		5C6CE6D31F59EA350007C6CB /* PageClientImplCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageClientImplCocoa.h; sourceTree = "<group>"; };
>@@ -6858,6 +6860,16 @@
> 			path = Cocoa;
> 			sourceTree = "<group>";
> 		};
>+		5C5CEC372209581B00D6BBB0 /* Daemon */ = {
>+			isa = PBXGroup;
>+			children = (
>+				5C5CEC382209583200D6BBB0 /* DaemonEntryPoint.h */,
>+				5C5CEC392209583200D6BBB0 /* DaemonEntryPoint.mm */,
>+			);
>+			name = Daemon;
>+			path = Cocoa/Daemon;
>+			sourceTree = "<group>";
>+		};
> 		5C74300C21500434004BFA17 /* API */ = {
> 			isa = PBXGroup;
> 			children = (
>@@ -8048,6 +8060,7 @@
> 		BC82837C16B45DA500A278FE /* EntryPoint */ = {
> 			isa = PBXGroup;
> 			children = (
>+				5C5CEC372209581B00D6BBB0 /* Daemon */,
> 				BC8283A116B4BD9100A278FE /* XPCService */,
> 			);
> 			path = EntryPoint;

Flags:

zalan: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 194278: 361159