Title: [218282] branches/safari-603-branch/Source/WebKit2
- Revision
- 218282
- Author
- matthew_han...@apple.com
- Date
- 2017-06-14 12:20:41 -0700 (Wed, 14 Jun 2017)
Log Message
Cherry-pick r218206. rdar://problem/32751025
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (218281 => 218282)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-06-14 19:20:39 UTC (rev 218281)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-06-14 19:20:41 UTC (rev 218282)
@@ -1,5 +1,24 @@
2017-06-14 Matthew Hanson <matthew_han...@apple.com>
+ Cherry-pick r218206. rdar://problem/32751025
+
+ 2017-06-13 Brent Fulgham <bfulg...@apple.com>
+
+ [WK2][macOS] Allow AppleEvents in Citrix View Plugin
+ https://bugs.webkit.org/show_bug.cgi?id=173280
+ <rdar://problem/31913624>
+
+ Reviewed by Alexey Proskuryakov.
+
+ A slightly better fix: Allow AppleEvents for non-sandboxed plugins. This should
+ avoid inadvertently breaking custom plugins, etc.
+
+ * PluginProcess/mac/PluginProcessMac.mm:
+ (WebKit::PluginProcess::platformInitializeProcess): Switch check from a specific Citrix
+ test, to just allowing non-sandboxed plugins to use AppleEvents.
+
+2017-06-14 Matthew Hanson <matthew_han...@apple.com>
+
Cherry-pick r218187. rdar://problem/32751025
2017-06-13 Brent Fulgham <bfulg...@apple.com>
Modified: branches/safari-603-branch/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm (218281 => 218282)
--- branches/safari-603-branch/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2017-06-14 19:20:39 UTC (rev 218281)
+++ branches/safari-603-branch/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2017-06-14 19:20:41 UTC (rev 218282)
@@ -607,7 +607,7 @@
if (m_pluginBundleIdentifier == "com.oracle.java.JavaAppletPlugin")
(new UserActivity("com.oracle.java.JavaAppletPlugin"))->start();
- if (m_pluginBundleIdentifier == "com.citrix.citrixicaclientplugIn") {
+ if (!pluginHasSandboxProfile(m_pluginBundleIdentifier)) {
// Allow Apple Events from Citrix plugin. This can be removed when <rdar://problem/14012823> is fixed.
setenv("__APPLEEVENTSSERVICENAME", "com.apple.coreservices.appleevents", 1);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
