Attachment 370168 Details for Bug 198007 – Patch

[patch] Patch

bug-198007-20190517164756.patch (text/plain), 15.54 KB, created by Alex Christensen on 2019-05-17 16:47:57 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-05-17 16:47:57 PDT

Size: 15.54 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 245488)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,22 @@
>+2019-05-17  Alex Christensen  <achristensen@webkit.org>
>+
>+        Revert r240956
>+        https://bugs.webkit.org/show_bug.cgi?id=198007
>+        <rdar://problem/49808949>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        r240956 made SafariForWebKitDevelopment crash when using WebKit nightly builds.
>+        Since it's not needed and the binary reduction wasn't too big, just revert that revision.
>+
>+        * Shared/API/Cocoa/WKMain.h: Removed.
>+        * Shared/API/Cocoa/WKMain.mm: Removed.
>+        * Shared/EntryPointUtilities/Cocoa/AuxiliaryProcessMain.cpp: Removed.
>+        * Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:
>+        (main):
>+        * SourcesCocoa.txt:
>+        * WebKit.xcodeproj/project.pbxproj:
>+
> 2019-05-17  Antoine Quint  <graouts@apple.com>
> 
>         Add a website policy to disable the legacy -webkit-overflow-scrolling:touch behavior
>Index: Source/WebKit/SourcesCocoa.txt
>===================================================================
>--- Source/WebKit/SourcesCocoa.txt	(revision 245481)
>+++ Source/WebKit/SourcesCocoa.txt	(working copy)
>@@ -111,7 +111,6 @@ Shared/API/Cocoa/_WKRemoteObjectRegistry
> Shared/API/Cocoa/RemoteObjectInvocation.mm
> Shared/API/Cocoa/RemoteObjectRegistry.mm
> Shared/API/Cocoa/WKBrowsingContextHandle.mm
>-Shared/API/Cocoa/WKMain.mm
> Shared/API/Cocoa/WKRemoteObject.mm
> Shared/API/Cocoa/WKRemoteObjectCoder.mm
> 
>Index: Source/WebKit/Shared/API/Cocoa/WKMain.h
>===================================================================
>--- Source/WebKit/Shared/API/Cocoa/WKMain.h	(revision 245476)
>+++ Source/WebKit/Shared/API/Cocoa/WKMain.h	(nonexistent)
>@@ -1,40 +0,0 @@
>-/*
>- * 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
>-
>-#include <WebKit/WKBase.h>
>-#include <WebKit/WKFoundation.h>
>-
>-#ifdef __cplusplus
>-extern "C" {
>-#endif
>-
>-WK_EXPORT int WKXPCServiceMain(int argc, const char** argv) WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
>-WK_EXPORT int WKDaemonMain(int argc, const char** argv) WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
>-
>-#ifdef __cplusplus
>-}
>-#endif
>Index: Source/WebKit/Shared/API/Cocoa/WKMain.mm
>===================================================================
>--- Source/WebKit/Shared/API/Cocoa/WKMain.mm	(revision 245476)
>+++ Source/WebKit/Shared/API/Cocoa/WKMain.mm	(nonexistent)
>@@ -1,40 +0,0 @@
>-/*
>- * 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.
>- */
>-
>-#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 245476)
>+++ Source/WebKit/Shared/EntryPointUtilities/Cocoa/AuxiliaryProcessMain.cpp	(nonexistent)
>@@ -1,33 +0,0 @@
>-/*
>- * 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.
>- */
>-
>-#include <WebKit/WKMain.h>
>-
>-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/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm
>===================================================================
>--- Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm	(revision 245476)
>+++ Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm	(working copy)
>@@ -149,3 +149,8 @@ int XPCServiceMain(int, const char**)
> }
> 
> } // namespace WebKit
>+
>+int main(int argc, const char** argv)
>+{
>+    return WebKit::XPCServiceMain(argc, argv);
>+}
>Index: Source/WebKit/WebKit.xcodeproj/project.pbxproj
>===================================================================
>--- Source/WebKit/WebKit.xcodeproj/project.pbxproj	(revision 245481)
>+++ Source/WebKit/WebKit.xcodeproj/project.pbxproj	(working copy)
>@@ -1073,16 +1073,15 @@
> 		5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4609E222430E4C009943C2 /* _WKContentRuleListAction.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4609E422430E4D009943C2 /* _WKContentRuleListActionInternal.h */; };
> 		5C4B9D8B210A8CCF008F14D1 /* UndoOrRedo.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B9D8A210A8C46008F14D1 /* UndoOrRedo.h */; };
>-		5C5CEC30220911C700D6BBB0 /* WKMain.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C5CEC2E2209114800D6BBB0 /* WKMain.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		5C5CEC32220912B300D6BBB0 /* AuxiliaryProcessMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C5CEC31220912AF00D6BBB0 /* AuxiliaryProcessMain.cpp */; };
>-		5C5CEC33220912B300D6BBB0 /* AuxiliaryProcessMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C5CEC31220912AF00D6BBB0 /* AuxiliaryProcessMain.cpp */; };
>-		5C5CEC34220912B400D6BBB0 /* AuxiliaryProcessMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C5CEC31220912AF00D6BBB0 /* AuxiliaryProcessMain.cpp */; };
>-		5C5CEC35220912B400D6BBB0 /* AuxiliaryProcessMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C5CEC31220912AF00D6BBB0 /* AuxiliaryProcessMain.cpp */; };
> 		5C5D238C227A2CDA000B9BDA /* _WKCustomHeaderFields.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C5D2389227A1892000B9BDA /* _WKCustomHeaderFields.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		5C62FDF91EFC271C00CE072E /* WKURLSchemeTaskPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C62FDF81EFC263C00CE072E /* WKURLSchemeTaskPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		5C7FB47021E97DC5009E3241 /* WebCookieJar.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C7FB46F21E97C0C009E3241 /* WebCookieJar.h */; };
> 		5C8BC797218CBB4800813886 /* SafeBrowsing.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5C8BC796218CB58A00813886 /* SafeBrowsing.xcassets */; };
> 		5C8DD3801FE4521600F2A556 /* WebsiteAutoplayPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C8DD37F1FE4519200F2A556 /* WebsiteAutoplayPolicy.h */; };
>+		5C9A9111228F69CC005C5B17 /* XPCServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839616B47EC400A278FE /* XPCServiceMain.mm */; };
>+		5C9A9112228F69CC005C5B17 /* XPCServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839616B47EC400A278FE /* XPCServiceMain.mm */; };
>+		5C9A9113228F69CD005C5B17 /* XPCServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839616B47EC400A278FE /* XPCServiceMain.mm */; };
>+		5C9A9114228F69CE005C5B17 /* XPCServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839616B47EC400A278FE /* XPCServiceMain.mm */; };
> 		5C9E56831DF7F1B300C9EE33 /* WKWebsitePolicies.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C9E56811DF7F05500C9EE33 /* WKWebsitePolicies.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		5CA26D81217ABD5B00F97A35 /* WKSafeBrowsingWarning.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CA26D80217ABBB600F97A35 /* WKSafeBrowsingWarning.h */; };
> 		5CA26D83217AD1B800F97A35 /* WKSafeBrowsingWarning.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CA26D7F217ABBB600F97A35 /* WKSafeBrowsingWarning.mm */; };
>@@ -3525,9 +3524,6 @@
> 		5C46C0AD21B7198C00BC5991 /* WebsiteDataStoreConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebsiteDataStoreConfiguration.h; sourceTree = "<group>"; };
> 		5C46C0AE21B71AE200BC5991 /* _WKWebsiteDataStoreConfigurationInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKWebsiteDataStoreConfigurationInternal.h; sourceTree = "<group>"; };
> 		5C4B9D8A210A8C46008F14D1 /* UndoOrRedo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UndoOrRedo.h; sourceTree = "<group>"; };
>-		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>"; };
> 		5C5D2387227A1891000B9BDA /* _WKCustomHeaderFieldsInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKCustomHeaderFieldsInternal.h; sourceTree = "<group>"; };
>@@ -6446,8 +6442,6 @@
> 				37A709A81E3EA40C00CA5969 /* WKDataDetectorTypesInternal.h */,
> 				F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */,
> 				37DFA6FF1810BB92001F4A9F /* WKFoundation.h */,
>-				5C5CEC2E2209114800D6BBB0 /* WKMain.h */,
>-				5C5CEC2F2209117E00D6BBB0 /* WKMain.mm */,
> 				1A9E32991822E1CC00F5D04C /* WKRemoteObject.h */,
> 				1A9E32981822E1CC00F5D04C /* WKRemoteObject.mm */,
> 				1A9E329D1822FEDD00F5D04C /* WKRemoteObjectCoder.h */,
>@@ -8215,7 +8209,6 @@
> 			isa = PBXGroup;
> 			children = (
> 				BC82836B16B3587900A278FE /* XPCService */,
>-				5C5CEC31220912AF00D6BBB0 /* AuxiliaryProcessMain.cpp */,
> 			);
> 			path = EntryPointUtilities;
> 			sourceTree = "<group>";
>@@ -9974,7 +9967,6 @@
> 				2DD5E129210ADC7B00DB6012 /* WKKeyboardScrollingAnimator.h in Headers */,
> 				51A9E10B1315CD18009E7031 /* WKKeyValueStorageManager.h in Headers */,
> 				2D790A9F1AD7164900AB90B3 /* WKLayoutMode.h in Headers */,
>-				5C5CEC30220911C700D6BBB0 /* WKMain.h in Headers */,
> 				C98C48AA1B6FD5B500145103 /* WKMediaSessionFocusManager.h in Headers */,
> 				C9CD439D1B4B024F00239E33 /* WKMediaSessionMetadata.h in Headers */,
> 				1AB40EE61BF677E300BA81BE /* WKMenuItemIdentifiersPrivate.h in Headers */,
>@@ -10952,7 +10944,7 @@
> 			isa = PBXSourcesBuildPhase;
> 			buildActionMask = 2147483647;
> 			files = (
>-				5C5CEC34220912B400D6BBB0 /* AuxiliaryProcessMain.cpp in Sources */,
>+				5C9A9112228F69CC005C5B17 /* XPCServiceMain.mm in Sources */,
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 		};
>@@ -11329,7 +11321,7 @@
> 			isa = PBXSourcesBuildPhase;
> 			buildActionMask = 2147483647;
> 			files = (
>-				5C5CEC35220912B400D6BBB0 /* AuxiliaryProcessMain.cpp in Sources */,
>+				5C9A9111228F69CC005C5B17 /* XPCServiceMain.mm in Sources */,
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 		};
>@@ -11337,7 +11329,7 @@
> 			isa = PBXSourcesBuildPhase;
> 			buildActionMask = 2147483647;
> 			files = (
>-				5C5CEC33220912B300D6BBB0 /* AuxiliaryProcessMain.cpp in Sources */,
>+				5C9A9113228F69CD005C5B17 /* XPCServiceMain.mm in Sources */,
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 		};
>@@ -11345,7 +11337,7 @@
> 			isa = PBXSourcesBuildPhase;
> 			buildActionMask = 2147483647;
> 			files = (
>-				5C5CEC32220912B300D6BBB0 /* AuxiliaryProcessMain.cpp in Sources */,
>+				5C9A9114228F69CE005C5B17 /* XPCServiceMain.mm in Sources */,
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 		};

Actions: View | Formatted Diff | Diff

Attachments on bug 198007: 370168