Attachment 339155 Details for Bug 185147 – Patch

[patch] Patch

185147.patch (text/plain), 11.76 KB, created by Michael Saboff on 2018-04-30 15:32:31 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Saboff

Created: 2018-04-30 15:32:31 PDT

Size: 11.76 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 231175)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2018-04-30  Michael Saboff  <msaboff@apple.com>
>+
>+        Eliminate WebProcessShim.dylib
>+        https://bugs.webkit.org/show_bug.cgi?id=185147
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/WebContentService.xcconfig:
>+        * WebKit.xcodeproj/project.pbxproj:
>+
> 2018-04-30  Alex Christensen  <achristensen@webkit.org>
> 
>         Add WKUIDelegatePrivate equivalent of WKPageContextMenuClient getContextMenuFromProposedMenuAsync
>Index: Source/WebKit/Configurations/WebContentService.xcconfig
>===================================================================
>--- Source/WebKit/Configurations/WebContentService.xcconfig	(revision 230847)
>+++ Source/WebKit/Configurations/WebContentService.xcconfig	(working copy)
>@@ -45,7 +45,6 @@ WK_APPKIT_LDFLAGS = $(WK_APPKIT_LDFLAGS_
> WK_APPKIT_LDFLAGS_macosx = -framework AppKit;
> 
> OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_$(WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG)) $(WK_APPKIT_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
>-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = $(BUILT_PRODUCTS_DIR)/WebProcessShim.dylib;
> 
> WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT = $(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT_$(WK_EMPTY_$(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT)));
> WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT_ = $(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT_NO);
>Index: Source/WebKit/WebKit.xcodeproj/project.pbxproj
>===================================================================
>--- Source/WebKit/WebKit.xcodeproj/project.pbxproj	(revision 230847)
>+++ Source/WebKit/WebKit.xcodeproj/project.pbxproj	(working copy)
>@@ -874,7 +874,6 @@
> 		37A709A91E3EA40C00CA5969 /* WKDataDetectorTypesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 37A709A81E3EA40C00CA5969 /* WKDataDetectorTypesInternal.h */; };
> 		37B0D1841C1E499A00D40D64 /* PluginProcessShim.dylib in Copy Shims */ = {isa = PBXBuildFile; fileRef = 1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */; };
> 		37B0D1851C1E499A00D40D64 /* SecItemShim.dylib in Copy Shims */ = {isa = PBXBuildFile; fileRef = 510031F61379CACB00C8DFE4 /* SecItemShim.dylib */; };
>-		37B0D1861C1E499A00D40D64 /* WebProcessShim.dylib in Copy Shims */ = {isa = PBXBuildFile; fileRef = CDC3830617211799008A2FC3 /* WebProcessShim.dylib */; };
> 		37B47E2D1D64DB76005F4EFF /* objcSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 37B47E2C1D64DB76005F4EFF /* objcSPI.h */; };
> 		37B5045219EEF31300CE2CF8 /* WKErrorPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 37B5045119EEF31300CE2CF8 /* WKErrorPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1C79A100E7FC50078DEBC /* WebCore.framework */; };
>@@ -2068,8 +2067,6 @@
> 		CDA29A2B1CBEB67A00901CCF /* PlaybackSessionManagerProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A271CBEB67A00901CCF /* PlaybackSessionManagerProxyMessages.h */; };
> 		CDC2831D201BD79D00E6E745 /* WKFullscreenStackView.h in Headers */ = {isa = PBXBuildFile; fileRef = CDC2831B201BD79D00E6E745 /* WKFullscreenStackView.h */; };
> 		CDC2831E201BD79D00E6E745 /* WKFullscreenStackView.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDC2831C201BD79D00E6E745 /* WKFullscreenStackView.mm */; };
>-		CDC382FE17211799008A2FC3 /* SecItemShimLibrary.mm in Sources */ = {isa = PBXBuildFile; fileRef = 511F8A78138B460900A95F44 /* SecItemShimLibrary.mm */; };
>-		CDC38307172117DD008A2FC3 /* CookieStorageShimLibrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDC382F9172116D3008A2FC3 /* CookieStorageShimLibrary.cpp */; };
> 		CDC3830C17212282008A2FC3 /* CookieStorageShimLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = CDC3830B172121CE008A2FC3 /* CookieStorageShimLibrary.h */; };
> 		CDCA85C8132ABA4E00E961DF /* WKFullScreenWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDCA85C6132ABA4E00E961DF /* WKFullScreenWindowController.mm */; };
> 		CDCA85C9132ABA4E00E961DF /* WKFullScreenWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = CDCA85C7132ABA4E00E961DF /* WKFullScreenWindowController.h */; };
>@@ -2246,13 +2243,6 @@
> 			remoteGlobalIDString = 510031EA1379CACB00C8DFE4;
> 			remoteInfo = SecItemShim;
> 		};
>-		37B1D0171C1E421100D67FE9 /* PBXContainerItemProxy */ = {
>-			isa = PBXContainerItemProxy;
>-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
>-			proxyType = 1;
>-			remoteGlobalIDString = CDC382FB17211799008A2FC3;
>-			remoteInfo = WebProcessShim;
>-		};
> 		37F7407812721F740093869B /* PBXContainerItemProxy */ = {
> 			isa = PBXContainerItemProxy;
> 			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
>@@ -2320,7 +2310,6 @@
> 			files = (
> 				37B0D1841C1E499A00D40D64 /* PluginProcessShim.dylib in Copy Shims */,
> 				37B0D1851C1E499A00D40D64 /* SecItemShim.dylib in Copy Shims */,
>-				37B0D1861C1E499A00D40D64 /* WebProcessShim.dylib in Copy Shims */,
> 			);
> 			name = "Copy Shims";
> 			runOnlyForDeploymentPostprocessing = 0;
>@@ -4607,7 +4596,6 @@
> 		CDC2831C201BD79D00E6E745 /* WKFullscreenStackView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = WKFullscreenStackView.mm; path = ios/fullscreen/WKFullscreenStackView.mm; sourceTree = "<group>"; };
> 		CDC382F717211506008A2FC3 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = /System/Library/Frameworks/CFNetwork.framework; sourceTree = "<absolute>"; };
> 		CDC382F9172116D3008A2FC3 /* CookieStorageShimLibrary.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CookieStorageShimLibrary.cpp; sourceTree = "<group>"; };
>-		CDC3830617211799008A2FC3 /* WebProcessShim.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = WebProcessShim.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
> 		CDC3830B172121CE008A2FC3 /* CookieStorageShimLibrary.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CookieStorageShimLibrary.h; sourceTree = "<group>"; };
> 		CDC8F4881725E67800166F6E /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
> 		CDCA85C6132ABA4E00E961DF /* WKFullScreenWindowController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKFullScreenWindowController.mm; sourceTree = "<group>"; };
>@@ -4814,13 +4802,6 @@
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 		};
>-		CDC382FF17211799008A2FC3 /* Frameworks */ = {
>-			isa = PBXFrameworksBuildPhase;
>-			buildActionMask = 2147483647;
>-			files = (
>-			);
>-			runOnlyForDeploymentPostprocessing = 0;
>-		};
> /* End PBXFrameworksBuildPhase section */
> 
> /* Begin PBXGroup section */
>@@ -4836,7 +4817,6 @@
> 				1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */,
> 				510031F61379CACB00C8DFE4 /* SecItemShim.dylib */,
> 				8DC2EF5B0486A6940098B216 /* WebKit.framework */,
>-				CDC3830617211799008A2FC3 /* WebProcessShim.dylib */,
> 			);
> 			name = Products;
> 			sourceTree = "<group>";
>@@ -9807,13 +9787,6 @@
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 		};
>-		CDC382FC17211799008A2FC3 /* Headers */ = {
>-			isa = PBXHeadersBuildPhase;
>-			buildActionMask = 2147483647;
>-			files = (
>-			);
>-			runOnlyForDeploymentPostprocessing = 0;
>-		};
> /* End PBXHeadersBuildPhase section */
> 
> /* Begin PBXNativeTarget section */
>@@ -9920,7 +9893,6 @@
> 				37F7407912721F740093869B /* PBXTargetDependency */,
> 				37B1D0141C1E421100D67FE9 /* PBXTargetDependency */,
> 				37B1D0161C1E421100D67FE9 /* PBXTargetDependency */,
>-				37B1D0181C1E421100D67FE9 /* PBXTargetDependency */,
> 			);
> 			name = WebKit;
> 			productInstallPath = "$(HOME)/Library/Frameworks";
>@@ -10000,23 +9972,6 @@
> 			productReference = BC82841F16B4FDF600A278FE /* com.apple.WebKit.Plugin.64.xpc */;
> 			productType = "com.apple.product-type.xpc-service";
> 		};
>-		CDC382FB17211799008A2FC3 /* WebProcessShim */ = {
>-			isa = PBXNativeTarget;
>-			buildConfigurationList = CDC3830217211799008A2FC3 /* Build configuration list for PBXNativeTarget "WebProcessShim" */;
>-			buildPhases = (
>-				CDC382FC17211799008A2FC3 /* Headers */,
>-				CDC382FD17211799008A2FC3 /* Sources */,
>-				CDC382FF17211799008A2FC3 /* Frameworks */,
>-			);
>-			buildRules = (
>-			);
>-			dependencies = (
>-			);
>-			name = WebProcessShim;
>-			productName = PluginProcessShim;
>-			productReference = CDC3830617211799008A2FC3 /* WebProcessShim.dylib */;
>-			productType = "com.apple.product-type.library.dynamic";
>-		};
> /* End PBXNativeTarget section */
> 
> /* Begin PBXProject section */
>@@ -10047,7 +10002,6 @@
> 				C0CE72851247E66800BC0EC4 /* Derived Sources */,
> 				1AC25FAF12A48EA700BD2671 /* PluginProcessShim */,
> 				510031EA1379CACB00C8DFE4 /* SecItemShim */,
>-				CDC382FB17211799008A2FC3 /* WebProcessShim */,
> 				BC3DE46515A91763008D26FC /* WebContent */,
> 				372EBB382017E64300085064 /* WebContent.Development */,
> 				BC8283B016B4BF7700A278FE /* Networking */,
>@@ -11480,15 +11434,6 @@
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 		};
>-		CDC382FD17211799008A2FC3 /* Sources */ = {
>-			isa = PBXSourcesBuildPhase;
>-			buildActionMask = 2147483647;
>-			files = (
>-				CDC38307172117DD008A2FC3 /* CookieStorageShimLibrary.cpp in Sources */,
>-				CDC382FE17211799008A2FC3 /* SecItemShimLibrary.mm in Sources */,
>-			);
>-			runOnlyForDeploymentPostprocessing = 0;
>-		};
> /* End PBXSourcesBuildPhase section */
> 
> /* Begin PBXTargetDependency section */
>@@ -11537,11 +11482,6 @@
> 			target = 510031EA1379CACB00C8DFE4 /* SecItemShim */;
> 			targetProxy = 37B1D0151C1E421100D67FE9 /* PBXContainerItemProxy */;
> 		};
>-		37B1D0181C1E421100D67FE9 /* PBXTargetDependency */ = {
>-			isa = PBXTargetDependency;
>-			target = CDC382FB17211799008A2FC3 /* WebProcessShim */;
>-			targetProxy = 37B1D0171C1E421100D67FE9 /* PBXContainerItemProxy */;
>-		};
> 		37F7407912721F740093869B /* PBXTargetDependency */ = {
> 			isa = PBXTargetDependency;
> 			target = C0CE72851247E66800BC0EC4 /* Derived Sources */;
>@@ -11887,30 +11827,6 @@
> 			};
> 			name = Production;
> 		};
>-		CDC3830317211799008A2FC3 /* Debug */ = {
>-			isa = XCBuildConfiguration;
>-			baseConfigurationReference = A1EDD2DD1884B9E300BBFE98 /* WebProcessShim.xcconfig */;
>-			buildSettings = {
>-				PRODUCT_NAME = WebProcessShim;
>-			};
>-			name = Debug;
>-		};
>-		CDC3830417211799008A2FC3 /* Release */ = {
>-			isa = XCBuildConfiguration;
>-			baseConfigurationReference = A1EDD2DD1884B9E300BBFE98 /* WebProcessShim.xcconfig */;
>-			buildSettings = {
>-				PRODUCT_NAME = WebProcessShim;
>-			};
>-			name = Release;
>-		};
>-		CDC3830517211799008A2FC3 /* Production */ = {
>-			isa = XCBuildConfiguration;
>-			baseConfigurationReference = A1EDD2DD1884B9E300BBFE98 /* WebProcessShim.xcconfig */;
>-			buildSettings = {
>-				PRODUCT_NAME = WebProcessShim;
>-			};
>-			name = Production;
>-		};
> /* End XCBuildConfiguration section */
> 
> /* Begin XCConfigurationList section */
>@@ -12044,16 +11960,6 @@
> 			defaultConfigurationIsVisible = 0;
> 			defaultConfigurationName = Production;
> 		};
>-		CDC3830217211799008A2FC3 /* Build configuration list for PBXNativeTarget "WebProcessShim" */ = {
>-			isa = XCConfigurationList;
>-			buildConfigurations = (
>-				CDC3830317211799008A2FC3 /* Debug */,
>-				CDC3830417211799008A2FC3 /* Release */,
>-				CDC3830517211799008A2FC3 /* Production */,
>-			);
>-			defaultConfigurationIsVisible = 0;
>-			defaultConfigurationName = Production;
>-		};
> /* End XCConfigurationList section */
> 	};
> 	rootObject = 0867D690FE84028FC02AAC07 /* Project object */;

Flags:

rniwa: review+
ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 185147: 339155 | 339166