Diff
Modified: branches/safari-605-branch/Source/WebKit/ChangeLog (227948 => 227949)
--- branches/safari-605-branch/Source/WebKit/ChangeLog 2018-02-01 04:18:38 UTC (rev 227948)
+++ branches/safari-605-branch/Source/WebKit/ChangeLog 2018-02-01 04:27:09 UTC (rev 227949)
@@ -1,5 +1,27 @@
2018-01-31 Jason Marcell <[email protected]>
+ Cherry-pick r227939. rdar://problem/37092137
+
+ 2018-01-31 Brent Fulgham <[email protected]>
+
+ REGRESSION(r220094): com.apple.WebKit.Storage lost its sandbox
+ https://bugs.webkit.org/show_bug.cgi?id=182354
+ <rdar://problem/37046844>
+
+ Reviewed by Ryosuke Niwa.
+
+ The Database process was renamed to Storage, but it's sandbox was not updated.
+
+ * Configurations/WebKit.xcconfig: Update for sandbox rename.
+ * DerivedSources.make: Ditto.
+ * Resources/SandboxProfiles/ios/com.apple.WebKit.Databases.sb: Removed.
+ * Resources/SandboxProfiles/ios/com.apple.WebKit.Storage.sb: Copied from Resources/SandboxProfiles/ios/com.apple.WebKit.Databases.sb.
+ * StorageProcess/mac/com.apple.WebKit.Databases.sb.in: Removed.
+ * StorageProcess/mac/com.apple.WebKit.Storage.sb.in: Copied from StorageProcess/mac/com.apple.WebKit.Databases.sb.in.
+ * WebKit.xcodeproj/project.pbxproj: Update for sandbox rename.
+
+2018-01-31 Jason Marcell <[email protected]>
+
Cherry-pick r227790. rdar://problem/37050332
2018-01-30 Brent Fulgham <[email protected]>
Modified: branches/safari-605-branch/Source/WebKit/Configurations/WebKit.xcconfig (227948 => 227949)
--- branches/safari-605-branch/Source/WebKit/Configurations/WebKit.xcconfig 2018-02-01 04:18:38 UTC (rev 227948)
+++ branches/safari-605-branch/Source/WebKit/Configurations/WebKit.xcconfig 2018-02-01 04:27:09 UTC (rev 227949)
@@ -71,7 +71,7 @@
SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,mac/WebKit2.order;
EXCLUDED_SOURCE_FILE_NAMES = Resources/ios/*;
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = PluginProcessShim.dylib SecItemShim.dylib WebProcessShim.dylib *.pdf Resources/mac/* com.apple.WebKit.Databases.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb com.apple.WebKit.plugin-common.sb PlugInSandboxProfiles/*.sb;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = PluginProcessShim.dylib SecItemShim.dylib WebProcessShim.dylib *.pdf Resources/mac/* com.apple.WebKit.Storage.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb com.apple.WebKit.plugin-common.sb PlugInSandboxProfiles/*.sb;
INSTALLHDRS_SCRIPT_PHASE = YES;
Modified: branches/safari-605-branch/Source/WebKit/DerivedSources.make (227948 => 227949)
--- branches/safari-605-branch/Source/WebKit/DerivedSources.make 2018-02-01 04:18:38 UTC (rev 227948)
+++ branches/safari-605-branch/Source/WebKit/DerivedSources.make 2018-02-01 04:27:09 UTC (rev 227949)
@@ -228,7 +228,7 @@
SANDBOX_PROFILES = \
com.apple.WebProcess.sb \
- com.apple.WebKit.Databases.sb \
+ com.apple.WebKit.Storage.sb \
com.apple.WebKit.plugin-common.sb \
com.apple.WebKit.NetworkProcess.sb
Deleted: branches/safari-605-branch/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.Databases.sb (227948 => 227949)
--- branches/safari-605-branch/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.Databases.sb 2018-02-01 04:18:38 UTC (rev 227948)
+++ branches/safari-605-branch/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.Databases.sb 2018-02-01 04:27:09 UTC (rev 227949)
@@ -1,45 +0,0 @@
-; Copyright (C) 2014 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.
-
-(version 1)
-(deny default (with partial-symbolication))
-(allow system-audit file-read-metadata)
-
-(deny mach-lookup (xpc-service-name-prefix ""))
-
-(import "common.sb")
-
-(allow file-read* file-write* (extension "com.apple.app-sandbox.read-write"))
-
-(deny sysctl*)
-(allow sysctl-read
- (sysctl-name
- "hw.availcpu"
- "hw.ncpu"
- "hw.model"
- "kern.memorystatus_level"
- "vm.footprint_suspend"))
-
-;; Various services required by system frameworks
-(allow mach-lookup
- (global-name "com.apple.analyticsd"))
Copied: branches/safari-605-branch/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.Storage.sb (from rev 227937, branches/safari-605-branch/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.Databases.sb) (0 => 227949)
--- branches/safari-605-branch/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.Storage.sb (rev 0)
+++ branches/safari-605-branch/Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.Storage.sb 2018-02-01 04:27:09 UTC (rev 227949)
@@ -0,0 +1,45 @@
+; Copyright (C) 2014 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.
+
+(version 1)
+(deny default (with partial-symbolication))
+(allow system-audit file-read-metadata)
+
+(deny mach-lookup (xpc-service-name-prefix ""))
+
+(import "common.sb")
+
+(allow file-read* file-write* (extension "com.apple.app-sandbox.read-write"))
+
+(deny sysctl*)
+(allow sysctl-read
+ (sysctl-name
+ "hw.availcpu"
+ "hw.ncpu"
+ "hw.model"
+ "kern.memorystatus_level"
+ "vm.footprint_suspend"))
+
+;; Various services required by system frameworks
+(allow mach-lookup
+ (global-name "com.apple.analyticsd"))
Deleted: branches/safari-605-branch/Source/WebKit/StorageProcess/mac/com.apple.WebKit.Databases.sb.in (227948 => 227949)
--- branches/safari-605-branch/Source/WebKit/StorageProcess/mac/com.apple.WebKit.Databases.sb.in 2018-02-01 04:18:38 UTC (rev 227948)
+++ branches/safari-605-branch/Source/WebKit/StorageProcess/mac/com.apple.WebKit.Databases.sb.in 2018-02-01 04:27:09 UTC (rev 227949)
@@ -1,134 +0,0 @@
-; Copyright (C) 2014-2016 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.
-
-(version 1)
-(deny default (with partial-symbolication))
-(allow system-audit file-read-metadata)
-
-(import "system.sb")
-
-;;; process-info* defaults to allow; deny it and then allow operations we actually need.
-(deny process-info*)
-(allow process-info-pidinfo)
-(allow process-info-setcontrol (target self))
-
-(deny sysctl*)
-(allow sysctl-read
- (sysctl-name
- "hw.availcpu"
- "hw.ncpu"
- "hw.model"
- "kern.memorystatus_level"
- "vm.footprint_suspend"))
-
-(deny iokit-get-properties)
-
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
-(deny mach-lookup (xpc-service-name-prefix ""))
-#endif
-
-;; Utility functions for home directory relative path filters
-(define (home-regex home-relative-regex)
- (regex (string-append "^" (regex-quote (param "HOME_DIR")) home-relative-regex)))
-
-(define (home-subpath home-relative-subpath)
- (subpath (string-append (param "HOME_DIR") home-relative-subpath)))
-
-(define (home-literal home-relative-literal)
- (literal (string-append (param "HOME_DIR") home-relative-literal)))
-
-(define (allow-read-write-directory-and-issue-read-write-extensions path)
- (if path
- (begin
- (allow file-read* file-write* (subpath path))
- (allow file-issue-extension (require-all (extension-class "com.apple.app-sandbox.read") (subpath path)))
- (allow file-issue-extension (require-all (extension-class "com.apple.app-sandbox.read-write") (subpath path))))))
-
-;; IOKit user clients
-(allow iokit-open
- (iokit-user-client-class "RootDomainUserClient"))
-
-;; Security framework
-(allow mach-lookup
- (global-name "com.apple.SecurityServer"))
-(allow user-preference-read
- (preference-domain
- "com.apple.security"
- "com.apple.security.revocation"))
-(allow file-read*
- (subpath "/private/var/db/mds")
- (literal "/private/var/db/DetachedSignatures")
- ; The following are needed until <rdar://problem/11134688> is resolved.
- (literal "/Library/Preferences/com.apple.security.plist")
- (literal "/Library/Preferences/com.apple.security.revocation.plist")
- (home-literal "/Library/Preferences/com.apple.security.plist")
- (home-literal "/Library/Preferences/com.apple.security.revocation.plist"))
-(allow ipc-posix-shm-read* ipc-posix-shm-write-data
- (ipc-posix-name "com.apple.AppleDatabaseChanged"))
-(if (positive? (string-length (param "DARWIN_USER_CACHE_DIR")))
- (allow-read-write-directory-and-issue-read-write-extensions (param "DARWIN_USER_CACHE_DIR")))
-(if (positive? (string-length (param "DARWIN_USER_TEMP_DIR")))
- (allow-read-write-directory-and-issue-read-write-extensions (param "DARWIN_USER_TEMP_DIR")))
-
-;; Read-only preferences and data
-(allow user-preference-read
- (preference-domain
- "kCFPreferencesAnyApplication"))
-(allow file-read*
- ;; Basic system paths
- (subpath "/Library/Frameworks")
- (subpath "/Library/Managed Preferences")
-
- ;; On-disk WebKit2 framework location, to account for debug installations
- ;; outside of /System/Library/Frameworks
- (subpath (param "WEBKIT2_FRAMEWORK_DIR")))
-(allow system-fsctl (fsctl-command (_IO "h" 47)))
-
-;; Various services required by CFNetwork and other frameworks
-(allow mach-lookup
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
- (global-name "com.apple.analyticsd")
-#endif
- (global-name "com.apple.lsd.mapdb")
-)
-
-;; Sandbox extensions
-(define (apply-read-and-issue-extension op path-filter)
- (op file-read* path-filter)
- (op file-issue-extension (require-all (extension-class "com.apple.app-sandbox.read") path-filter)))
-(define (apply-write-and-issue-extension op path-filter)
- (op file-write* path-filter)
- (op file-issue-extension (require-all (extension-class "com.apple.app-sandbox.read-write") path-filter)))
-(define (read-only-and-issue-extensions path-filter)
- (apply-read-and-issue-extension allow path-filter))
-(define (read-write-and-issue-extensions path-filter)
- (apply-read-and-issue-extension allow path-filter)
- (apply-write-and-issue-extension allow path-filter))
-(read-only-and-issue-extensions (extension "com.apple.app-sandbox.read"))
-(read-write-and-issue-extensions (extension "com.apple.app-sandbox.read-write"))
-
-(if (defined? 'vnode-type)
- (deny file-write-create (vnode-type SYMLINK)))
-
-;; Reserve a namespace for additional protected extended attributes.
-(deny file-read-xattr file-write-xattr (xattr-regex #"^com\.apple\.security\.private\."))
Copied: branches/safari-605-branch/Source/WebKit/StorageProcess/mac/com.apple.WebKit.Storage.sb.in (from rev 227937, branches/safari-605-branch/Source/WebKit/StorageProcess/mac/com.apple.WebKit.Databases.sb.in) (0 => 227949)
--- branches/safari-605-branch/Source/WebKit/StorageProcess/mac/com.apple.WebKit.Storage.sb.in (rev 0)
+++ branches/safari-605-branch/Source/WebKit/StorageProcess/mac/com.apple.WebKit.Storage.sb.in 2018-02-01 04:27:09 UTC (rev 227949)
@@ -0,0 +1,134 @@
+; Copyright (C) 2014-2016 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.
+
+(version 1)
+(deny default (with partial-symbolication))
+(allow system-audit file-read-metadata)
+
+(import "system.sb")
+
+;;; process-info* defaults to allow; deny it and then allow operations we actually need.
+(deny process-info*)
+(allow process-info-pidinfo)
+(allow process-info-setcontrol (target self))
+
+(deny sysctl*)
+(allow sysctl-read
+ (sysctl-name
+ "hw.availcpu"
+ "hw.ncpu"
+ "hw.model"
+ "kern.memorystatus_level"
+ "vm.footprint_suspend"))
+
+(deny iokit-get-properties)
+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
+(deny mach-lookup (xpc-service-name-prefix ""))
+#endif
+
+;; Utility functions for home directory relative path filters
+(define (home-regex home-relative-regex)
+ (regex (string-append "^" (regex-quote (param "HOME_DIR")) home-relative-regex)))
+
+(define (home-subpath home-relative-subpath)
+ (subpath (string-append (param "HOME_DIR") home-relative-subpath)))
+
+(define (home-literal home-relative-literal)
+ (literal (string-append (param "HOME_DIR") home-relative-literal)))
+
+(define (allow-read-write-directory-and-issue-read-write-extensions path)
+ (if path
+ (begin
+ (allow file-read* file-write* (subpath path))
+ (allow file-issue-extension (require-all (extension-class "com.apple.app-sandbox.read") (subpath path)))
+ (allow file-issue-extension (require-all (extension-class "com.apple.app-sandbox.read-write") (subpath path))))))
+
+;; IOKit user clients
+(allow iokit-open
+ (iokit-user-client-class "RootDomainUserClient"))
+
+;; Security framework
+(allow mach-lookup
+ (global-name "com.apple.SecurityServer"))
+(allow user-preference-read
+ (preference-domain
+ "com.apple.security"
+ "com.apple.security.revocation"))
+(allow file-read*
+ (subpath "/private/var/db/mds")
+ (literal "/private/var/db/DetachedSignatures")
+ ; The following are needed until <rdar://problem/11134688> is resolved.
+ (literal "/Library/Preferences/com.apple.security.plist")
+ (literal "/Library/Preferences/com.apple.security.revocation.plist")
+ (home-literal "/Library/Preferences/com.apple.security.plist")
+ (home-literal "/Library/Preferences/com.apple.security.revocation.plist"))
+(allow ipc-posix-shm-read* ipc-posix-shm-write-data
+ (ipc-posix-name "com.apple.AppleDatabaseChanged"))
+(if (positive? (string-length (param "DARWIN_USER_CACHE_DIR")))
+ (allow-read-write-directory-and-issue-read-write-extensions (param "DARWIN_USER_CACHE_DIR")))
+(if (positive? (string-length (param "DARWIN_USER_TEMP_DIR")))
+ (allow-read-write-directory-and-issue-read-write-extensions (param "DARWIN_USER_TEMP_DIR")))
+
+;; Read-only preferences and data
+(allow user-preference-read
+ (preference-domain
+ "kCFPreferencesAnyApplication"))
+(allow file-read*
+ ;; Basic system paths
+ (subpath "/Library/Frameworks")
+ (subpath "/Library/Managed Preferences")
+
+ ;; On-disk WebKit2 framework location, to account for debug installations
+ ;; outside of /System/Library/Frameworks
+ (subpath (param "WEBKIT2_FRAMEWORK_DIR")))
+(allow system-fsctl (fsctl-command (_IO "h" 47)))
+
+;; Various services required by CFNetwork and other frameworks
+(allow mach-lookup
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
+ (global-name "com.apple.analyticsd")
+#endif
+ (global-name "com.apple.lsd.mapdb")
+)
+
+;; Sandbox extensions
+(define (apply-read-and-issue-extension op path-filter)
+ (op file-read* path-filter)
+ (op file-issue-extension (require-all (extension-class "com.apple.app-sandbox.read") path-filter)))
+(define (apply-write-and-issue-extension op path-filter)
+ (op file-write* path-filter)
+ (op file-issue-extension (require-all (extension-class "com.apple.app-sandbox.read-write") path-filter)))
+(define (read-only-and-issue-extensions path-filter)
+ (apply-read-and-issue-extension allow path-filter))
+(define (read-write-and-issue-extensions path-filter)
+ (apply-read-and-issue-extension allow path-filter)
+ (apply-write-and-issue-extension allow path-filter))
+(read-only-and-issue-extensions (extension "com.apple.app-sandbox.read"))
+(read-write-and-issue-extensions (extension "com.apple.app-sandbox.read-write"))
+
+(if (defined? 'vnode-type)
+ (deny file-write-create (vnode-type SYMLINK)))
+
+;; Reserve a namespace for additional protected extended attributes.
+(deny file-read-xattr file-write-xattr (xattr-regex #"^com\.apple\.security\.private\."))
Modified: branches/safari-605-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj (227948 => 227949)
--- branches/safari-605-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2018-02-01 04:18:38 UTC (rev 227948)
+++ branches/safari-605-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2018-02-01 04:27:09 UTC (rev 227949)
@@ -1569,7 +1569,7 @@
A58B6F0918FCA733008CBA53 /* WKFileUploadPanel.mm in Sources */ = {isa = PBXBuildFile; fileRef = A58B6F0718FCA733008CBA53 /* WKFileUploadPanel.mm */; };
A5D3504E1D78F5B3005124A9 /* RemoteWebInspectorProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorProxyMac.mm */; };
A5EFD38C16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = A5EFD38B16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
- A78CCDDA193AC9F4005ECC25 /* com.apple.WebKit.Databases.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = A78CCDD7193AC9E3005ECC25 /* com.apple.WebKit.Databases.sb */; };
+ A78CCDDA193AC9F4005ECC25 /* com.apple.WebKit.Storage.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = A78CCDD7193AC9E3005ECC25 /* com.apple.WebKit.Storage.sb */; };
A78CCDDB193AC9F8005ECC25 /* com.apple.WebKit.Networking.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = A78CCDD8193AC9E3005ECC25 /* com.apple.WebKit.Networking.sb */; };
A78CCDDC193AC9FB005ECC25 /* com.apple.WebKit.WebContent.sb in CopyFiles */ = {isa = PBXBuildFile; fileRef = A78CCDD9193AC9E3005ECC25 /* com.apple.WebKit.WebContent.sb */; };
A7D792D61767CB6E00881CBE /* ActivityAssertion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7D792D51767CB6E00881CBE /* ActivityAssertion.cpp */; };
@@ -2042,7 +2042,7 @@
DF58C6361371ACA000F9A37C /* NativeWebWheelEventMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = DF58C6351371ACA000F9A37C /* NativeWebWheelEventMac.mm */; };
E105FE5418D7B9DE008F57A8 /* EditingRange.h in Headers */ = {isa = PBXBuildFile; fileRef = E105FE5318D7B9DE008F57A8 /* EditingRange.h */; };
E115C714190F89E400ECC516 /* StorageProcessIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1FEF39C190F791C00731658 /* StorageProcessIOS.mm */; };
- E115C716190F8A2500ECC516 /* com.apple.WebKit.Databases.sb in Resources */ = {isa = PBXBuildFile; fileRef = E115C715190F8A2500ECC516 /* com.apple.WebKit.Databases.sb */; };
+ E115C716190F8A2500ECC516 /* com.apple.WebKit.Storage.sb in Resources */ = {isa = PBXBuildFile; fileRef = E115C715190F8A2500ECC516 /* com.apple.WebKit.Storage.sb */; };
E11D35AE16B63D1B006D23D7 /* com.apple.WebProcess.sb in Resources */ = {isa = PBXBuildFile; fileRef = E1967E37150AB5E200C73169 /* com.apple.WebProcess.sb */; };
E14A954916E016A40068DE82 /* NetworkProcessPlatformStrategies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E14A954716E016A40068DE82 /* NetworkProcessPlatformStrategies.cpp */; };
E14A954A16E016A40068DE82 /* NetworkProcessPlatformStrategies.h in Headers */ = {isa = PBXBuildFile; fileRef = E14A954816E016A40068DE82 /* NetworkProcessPlatformStrategies.h */; };
@@ -2296,8 +2296,8 @@
dstPath = "$(INSTALL_PATH)";
dstSubfolderSpec = 0;
files = (
- A78CCDDA193AC9F4005ECC25 /* com.apple.WebKit.Databases.sb in CopyFiles */,
A78CCDDB193AC9F8005ECC25 /* com.apple.WebKit.Networking.sb in CopyFiles */,
+ A78CCDDA193AC9F4005ECC25 /* com.apple.WebKit.Storage.sb in CopyFiles */,
A78CCDDC193AC9FB005ECC25 /* com.apple.WebKit.WebContent.sb in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -4001,7 +4001,7 @@
A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteWebInspectorProxyMac.mm; sourceTree = "<group>"; };
A5EFD38B16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageVisibilityTypes.h; sourceTree = "<group>"; };
A72D5D7F1236CBA800A88B15 /* APISerializedScriptValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APISerializedScriptValue.h; sourceTree = "<group>"; };
- A78CCDD7193AC9E3005ECC25 /* com.apple.WebKit.Databases.sb */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.WebKit.Databases.sb; sourceTree = "<group>"; };
+ A78CCDD7193AC9E3005ECC25 /* com.apple.WebKit.Storage.sb */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.WebKit.Storage.sb; sourceTree = "<group>"; };
A78CCDD8193AC9E3005ECC25 /* com.apple.WebKit.Networking.sb */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.WebKit.Networking.sb; sourceTree = "<group>"; };
A78CCDD9193AC9E3005ECC25 /* com.apple.WebKit.WebContent.sb */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.WebKit.WebContent.sb; sourceTree = "<group>"; };
A7BD9863194653D400D35698 /* Databases-iOS.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "Databases-iOS.entitlements"; sourceTree = "<group>"; };
@@ -4513,7 +4513,7 @@
DF58C6311371AC5800F9A37C /* NativeWebWheelEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeWebWheelEvent.h; sourceTree = "<group>"; };
DF58C6351371ACA000F9A37C /* NativeWebWheelEventMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NativeWebWheelEventMac.mm; sourceTree = "<group>"; };
E105FE5318D7B9DE008F57A8 /* EditingRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingRange.h; sourceTree = "<group>"; };
- E115C715190F8A2500ECC516 /* com.apple.WebKit.Databases.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.apple.WebKit.Databases.sb; sourceTree = "<group>"; };
+ E115C715190F8A2500ECC516 /* com.apple.WebKit.Storage.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.apple.WebKit.Storage.sb; sourceTree = "<group>"; };
E133FD891423DD7F00FC7BFB /* WebKit.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = WebKit.icns; path = Resources/WebKit.icns; sourceTree = "<group>"; };
E14A954716E016A40068DE82 /* NetworkProcessPlatformStrategies.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkProcessPlatformStrategies.cpp; path = NetworkProcess/NetworkProcessPlatformStrategies.cpp; sourceTree = "<group>"; };
E14A954816E016A40068DE82 /* NetworkProcessPlatformStrategies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkProcessPlatformStrategies.h; path = NetworkProcess/NetworkProcessPlatformStrategies.h; sourceTree = "<group>"; };
@@ -4559,7 +4559,7 @@
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>"; };
E1EE53E611F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageEditorClient.cpp; sourceTree = "<group>"; };
- E1FEF39A190F76F300731658 /* com.apple.WebKit.Databases.sb.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.WebKit.Databases.sb.in; sourceTree = "<group>"; };
+ E1FEF39A190F76F300731658 /* com.apple.WebKit.Storage.sb.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.WebKit.Storage.sb.in; sourceTree = "<group>"; };
E1FEF39C190F791C00731658 /* StorageProcessIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StorageProcessIOS.mm; sourceTree = "<group>"; };
E413F59B1AC1ADB600345360 /* NetworkCacheEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheEntry.h; sourceTree = "<group>"; };
E413F59E1AC1AF9D00345360 /* NetworkCacheEntry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCacheEntry.cpp; sourceTree = "<group>"; };
@@ -6469,7 +6469,7 @@
517DD5C0180DB7AA0081660B /* mac */ = {
isa = PBXGroup;
children = (
- E1FEF39A190F76F300731658 /* com.apple.WebKit.Databases.sb.in */,
+ E1FEF39A190F76F300731658 /* com.apple.WebKit.Storage.sb.in */,
51E35201180F5D1E00E53BE9 /* StorageProcessMac.mm */,
);
path = mac;
@@ -6864,8 +6864,8 @@
A78CCDD6193AC9E3005ECC25 /* ios */ = {
isa = PBXGroup;
children = (
- A78CCDD7193AC9E3005ECC25 /* com.apple.WebKit.Databases.sb */,
A78CCDD8193AC9E3005ECC25 /* com.apple.WebKit.Networking.sb */,
+ A78CCDD7193AC9E3005ECC25 /* com.apple.WebKit.Storage.sb */,
A78CCDD9193AC9E3005ECC25 /* com.apple.WebKit.WebContent.sb */,
);
path = ios;
@@ -8103,9 +8103,9 @@
517CF0E1163A486C00C2950F /* CacheStorageEngineConnectionMessageReceiver.cpp */,
51FAEC361B0657310009C4E7 /* ChildProcessMessageReceiver.cpp */,
51FAEC371B0657310009C4E7 /* ChildProcessMessages.h */,
- E115C715190F8A2500ECC516 /* com.apple.WebKit.Databases.sb */,
E17AE2C216B9C63A001C42F1 /* com.apple.WebKit.NetworkProcess.sb */,
7A1506721DD56298001F4B58 /* com.apple.WebKit.plugin-common.sb */,
+ E115C715190F8A2500ECC516 /* com.apple.WebKit.Storage.sb */,
E1967E37150AB5E200C73169 /* com.apple.WebProcess.sb */,
1AB7D6171288B9D900CFD08C /* DownloadProxyMessageReceiver.cpp */,
1AB7D6181288B9D900CFD08C /* DownloadProxyMessages.h */,
@@ -9814,8 +9814,8 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- E115C716190F8A2500ECC516 /* com.apple.WebKit.Databases.sb in Resources */,
E17AE2C316B9C63A001C42F1 /* com.apple.WebKit.NetworkProcess.sb in Resources */,
+ E115C716190F8A2500ECC516 /* com.apple.WebKit.Storage.sb in Resources */,
E11D35AE16B63D1B006D23D7 /* com.apple.WebProcess.sb in Resources */,
6BE969C11E54D452008B7483 /* corePrediction_model in Resources */,
8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */,
@@ -9999,7 +9999,7 @@
files = (
);
inputPaths = (
- "$(SRCROOT)/Resources/SandboxProfiles/ios/com.apple.WebKit.Databases.sb",
+ "$(SRCROOT)/Resources/SandboxProfiles/ios/com.apple.WebKit.Storage.sb",
"$(SRCROOT)/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb",
"$(SRCROOT)/Resources/SandboxProfiles/ios/com.apple.WebKit.WebContent.sb",
);
