Changeset 244747 in webkit

Timestamp:

Apr 29, 2019 12:52:56 PM (5 years ago)

Author:

Brent Fulgham

Message:

[Cocoa] Move common sandbox files from Shared/mac to Shared/Cocoa
​https://bugs.webkit.org/show_bug.cgi?id=197376
<rdar://problem/50305272>

Reviewed by Dean Jackson.

The Apple sandboxing logic currently lives in the inappropriate 'Shared/mac' directory. This is
confusing because the code is used by all Apple ports, not just macOS.

This patch just moves the relevant files from 'Shared/mac' to 'Shared/Cocoa' to avoid this confusion.

• Shared/Cocoa/SandboxExtensionCocoa.mm: Renamed from Source/WebKit/Shared/mac/SandboxExtensionMac.mm.
• Shared/Cocoa/SandboxInitialiationParametersCocoa.mm: Renamed from Source/WebKit/Shared/mac/SandboxInitialiationParametersMac.mm.
• Shared/Cocoa/SandboxUtilities.h: Renamed from Source/WebKit/Shared/mac/SandboxUtilities.h.
• Shared/Cocoa/SandboxUtilities.mm: Renamed from Source/WebKit/Shared/mac/SandboxUtilities.mm.
• SourcesCocoa.txt:
• WebKit.xcodeproj/project.pbxproj:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/Cocoa/SandboxExtensionCocoa.mm (moved) (moved from trunk/Source/WebKit/Shared/mac/SandboxExtensionMac.mm) (2 diffs)
• Shared/Cocoa/SandboxInitialiationParametersCocoa.mm (moved) (moved from trunk/Source/WebKit/Shared/mac/SandboxInitialiationParametersMac.mm)
• Shared/Cocoa/SandboxUtilities.h (moved) (moved from trunk/Source/WebKit/Shared/mac/SandboxUtilities.h)
• Shared/Cocoa/SandboxUtilities.mm (moved) (moved from trunk/Source/WebKit/Shared/mac/SandboxUtilities.mm)
• SourcesCocoa.txt (modified) (2 diffs)
• WebKit.xcodeproj/project.pbxproj (modified) (6 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-04-29  Brent Fulgham  <bfulgham@apple.com>
+
+        [Cocoa] Move common sandbox files from Shared/mac to Shared/Cocoa
+        https://bugs.webkit.org/show_bug.cgi?id=197376
+        <rdar://problem/50305272>
+
+        Reviewed by Dean Jackson.
+
+        The Apple sandboxing logic currently lives in the inappropriate 'Shared/mac' directory. This is
+        confusing because the code is used by all Apple ports, not just macOS.
+
+        This patch just moves the relevant files from 'Shared/mac' to 'Shared/Cocoa' to avoid this confusion.
+
+        * Shared/Cocoa/SandboxExtensionCocoa.mm: Renamed from Source/WebKit/Shared/mac/SandboxExtensionMac.mm.
+        * Shared/Cocoa/SandboxInitialiationParametersCocoa.mm: Renamed from Source/WebKit/Shared/mac/SandboxInitialiationParametersMac.mm.
+        * Shared/Cocoa/SandboxUtilities.h: Renamed from Source/WebKit/Shared/mac/SandboxUtilities.h.
+        * Shared/Cocoa/SandboxUtilities.mm: Renamed from Source/WebKit/Shared/mac/SandboxUtilities.mm.
+        * SourcesCocoa.txt:
+        * WebKit.xcodeproj/project.pbxproj:
+
 2019-04-29  Alexander Mikhaylenko  <exalm7659@gmail.com>
 

trunk/Source/WebKit/Shared/Cocoa/SandboxExtensionCocoa.mm

@@ -59 +59 @@
     }
 
-    bool consume() WARN_UNUSED_RETURN
+    bool WARN_UNUSED_RETURN consume()
     {
         m_handle = sandbox_extension_consume(m_token);
@@ -78 +78 @@
     }
 
-    const char* getSerializedFormat(size_t& length) WARN_UNUSED_RETURN
+    const char* WARN_UNUSED_RETURN getSerializedFormat(size_t& length)
     {
         length = strlen(m_token);

trunk/Source/WebKit/SourcesCocoa.txt

@@ -144 +144 @@
 Shared/Cocoa/DataDetectionResult.mm
 Shared/Cocoa/LoadParametersCocoa.mm
+Shared/Cocoa/SandboxExtensionCocoa.mm
+Shared/Cocoa/SandboxInitialiationParametersCocoa.mm
+Shared/Cocoa/SandboxUtilities.mm
 Shared/Cocoa/SharedRingBufferStorage.cpp
 Shared/Cocoa/WebCoreArgumentCodersCocoa.mm
@@ -187 +190 @@
 Shared/mac/PDFKitImports.mm
 Shared/mac/PrintInfoMac.mm
-Shared/mac/SandboxExtensionMac.mm
-Shared/mac/SandboxInitialiationParametersMac.mm
-Shared/mac/SandboxUtilities.mm
 Shared/mac/SecItemRequestData.cpp
 Shared/mac/SecItemResponseData.cpp

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

@@ -2240 +2240 @@
                 1AAB037B185F99D800EDF501 /* APIData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIData.cpp; sourceTree = "<group>"; };
                 1AAB4A8C1296F0A20023952F /* SandboxExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SandboxExtension.h; sourceTree = "<group>"; };
-                1AAB4AA91296F1540023952F /* SandboxExtensionMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SandboxExtensionMac.mm; sourceTree = "<group>"; };
                 1AABFE391829C1ED005B070E /* _WKRemoteObjectInterfaceInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKRemoteObjectInterfaceInternal.h; sourceTree = "<group>"; };
                 1AADE6FE10D855FC00D3D63D /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; };
@@ -3623 +3622 @@
                 7A8A9D591EF13020009801AE /* APIInjectedBundleBundleClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIInjectedBundleBundleClient.h; sourceTree = "<group>"; };
                 7A8A9D5B1EF1458E009801AE /* APIInjectedBundlePageResourceLoadClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIInjectedBundlePageResourceLoadClient.h; sourceTree = "<group>"; };
+                7AB4EA3F22777C460085BBAA /* SandboxExtensionCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SandboxExtensionCocoa.mm; sourceTree = "<group>"; };
+                7AB4EA4122777FC70085BBAA /* SandboxInitialiationParametersCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SandboxInitialiationParametersCocoa.mm; sourceTree = "<group>"; };
+                7AB4EA42227780DD0085BBAA /* SandboxUtilities.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SandboxUtilities.mm; sourceTree = "<group>"; };
                 7AB6EA441EEAAE2300037B2B /* APIIconDatabaseClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIIconDatabaseClient.h; sourceTree = "<group>"; };
                 7AB6EA461EEAB6B000037B2B /* APIGeolocationProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIGeolocationProvider.h; sourceTree = "<group>"; };
@@ -4543 +4545 @@
                 E1967E37150AB5E200C73169 /* com.apple.WebProcess.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = com.apple.WebProcess.sb; path = DerivedSources/WebKit2/com.apple.WebProcess.sb; sourceTree = BUILT_PRODUCTS_DIR; };
                 E19BDA8419365F4B00B97F57 /* com.apple.appstore.CodeRedeemerNetscapePlugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.apple.appstore.CodeRedeemerNetscapePlugin.sb; sourceTree = "<group>"; };
-                E19BDA87193686A400B97F57 /* SandboxUtilities.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SandboxUtilities.mm; sourceTree = "<group>"; };
                 E19BDA88193686A400B97F57 /* SandboxUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SandboxUtilities.h; sourceTree = "<group>"; };
                 E1A31731134CEA6C007C9A4F /* AttributedString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AttributedString.h; sourceTree = "<group>"; };
@@ -4554 +4555 @@
                 E1CC1B8F12D7EADF00625838 /* PrintInfoMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PrintInfoMac.mm; sourceTree = "<group>"; };
                 E1D26A4C1759634E0095BFD1 /* WebContentProcess.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = WebContentProcess.xib; path = Resources/WebContentProcess.xib; sourceTree = "<group>"; };
-                E1E552C216AE065E004ED653 /* SandboxInitialiationParametersMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SandboxInitialiationParametersMac.mm; sourceTree = "<group>"; };
                 E1E552C316AE065E004ED653 /* SandboxInitializationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SandboxInitializationParameters.h; sourceTree = "<group>"; };
                 E1EE53DC11F8CF9F00CCBEE4 /* InjectedBundlePageEditorClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageEditorClient.h; sourceTree = "<group>"; };
@@ -6353 +6353 @@
                                 CD2865EC2255562000606AC7 /* ProcessTaskStateObserver.h */,
                                 CD2865ED2255562000606AC7 /* ProcessTaskStateObserver.mm */,
+                                7AB4EA3F22777C460085BBAA /* SandboxExtensionCocoa.mm */,
+                                7AB4EA4122777FC70085BBAA /* SandboxInitialiationParametersCocoa.mm */,
+                                E19BDA88193686A400B97F57 /* SandboxUtilities.h */,
+                                7AB4EA42227780DD0085BBAA /* SandboxUtilities.mm */,
                                 CD4B4D9A1E765E0000D27092 /* SharedRingBufferStorage.cpp */,
                                 CD4B4D9B1E765E0000D27092 /* SharedRingBufferStorage.h */,
@@ -7976 +7980 @@
                                 E19582D4153CC05300B60875 /* PDFKitImports.mm */,
                                 E1CC1B8F12D7EADF00625838 /* PrintInfoMac.mm */,
-                                1AAB4AA91296F1540023952F /* SandboxExtensionMac.mm */,
-                                E1E552C216AE065E004ED653 /* SandboxInitialiationParametersMac.mm */,
-                                E19BDA88193686A400B97F57 /* SandboxUtilities.h */,
-                                E19BDA87193686A400B97F57 /* SandboxUtilities.mm */,
                                 51D1304F1382EAC000351EDD /* SecItemRequestData.cpp */,
                                 51D130501382EAC000351EDD /* SecItemRequestData.h */,