Title: [188535] branches/safari-601.1-branch/Source/WebKit2
- Revision
- 188535
- Author
- [email protected]
- Date
- 2015-08-17 12:52:56 -0700 (Mon, 17 Aug 2015)
Log Message
Merge r188365. rdar://problem/22254920
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (188534 => 188535)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-08-17 19:52:53 UTC (rev 188534)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-08-17 19:52:56 UTC (rev 188535)
@@ -1,3 +1,18 @@
+2015-08-17 Matthew Hanson <[email protected]>
+
+ Merge r188365. rdar://problem/22254920
+
+ 2015-08-12 Alexey Proskuryakov <[email protected]>
+
+ [Mac] WebKit processes should have access to com.apple.nesessionmanager.flow-divert-token
+ https://bugs.webkit.org/show_bug.cgi?id=147949
+ rdar://problem/22254920
+
+ Reviewed by Anders Carlsson.
+
+ * NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in:
+ * WebProcess/com.apple.WebProcess.sb.in:
+
2015-08-14 Babak Shafiei <[email protected]>
Merge r188486.
Modified: branches/safari-601.1-branch/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in (188534 => 188535)
--- branches/safari-601.1-branch/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in 2015-08-17 19:52:53 UTC (rev 188534)
+++ branches/safari-601.1-branch/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in 2015-08-17 19:52:56 UTC (rev 188535)
@@ -92,7 +92,11 @@
(global-name "com.apple.PowerManagement.control")
(global-name "com.apple.SystemConfiguration.configd")
(global-name "com.apple.cookied")
- (global-name "com.apple.cfnetwork.AuthBrokerAgent"))
+ (global-name "com.apple.cfnetwork.AuthBrokerAgent")
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+ (global-name "com.apple.nesessionmanager.flow-divert-token")
+#endif
+)
;; Security framework
(allow mach-lookup
Modified: branches/safari-601.1-branch/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in (188534 => 188535)
--- branches/safari-601.1-branch/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in 2015-08-17 19:52:53 UTC (rev 188534)
+++ branches/safari-601.1-branch/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in 2015-08-17 19:52:56 UTC (rev 188535)
@@ -197,6 +197,9 @@
(global-name "com.apple.iconservices")
(global-name "com.apple.iconservices.store")
#endif
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+ (global-name "com.apple.nesessionmanager.flow-divert-token")
+#endif
)
;; Security framework
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
