Title: [218281] branches/safari-603-branch/Source/WebKit2
- Revision
- 218281
- Author
- matthew_han...@apple.com
- Date
- 2017-06-14 12:20:39 -0700 (Wed, 14 Jun 2017)
Log Message
Cherry-pick r218187. rdar://problem/32751025
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (218280 => 218281)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-06-14 19:20:29 UTC (rev 218280)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-06-14 19:20:39 UTC (rev 218281)
@@ -1,3 +1,20 @@
+2017-06-14 Matthew Hanson <matthew_han...@apple.com>
+
+ Cherry-pick r218187. 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.
+
+ Allow the Citrix Viewer plugin to issue Apple Events.
+
+ * PluginProcess/mac/PluginProcessMac.mm:
+ (WebKit::PluginProcess::platformInitializeProcess): Allow AppleEvents for the Citrix Viewer plugin.
+
2017-06-01 Matthew Hanson <matthew_han...@apple.com>
Cherry-pick r212173. rdar://problem/32080671
Modified: branches/safari-603-branch/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm (218280 => 218281)
--- branches/safari-603-branch/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2017-06-14 19:20:29 UTC (rev 218280)
+++ branches/safari-603-branch/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2017-06-14 19:20:39 UTC (rev 218281)
@@ -606,6 +606,11 @@
// FIXME: Workaround for Java not liking its plugin process to be suppressed - <rdar://problem/14267843>
if (m_pluginBundleIdentifier == "com.oracle.java.JavaAppletPlugin")
(new UserActivity("com.oracle.java.JavaAppletPlugin"))->start();
+
+ if (m_pluginBundleIdentifier == "com.citrix.citrixicaclientplugIn") {
+ // Allow Apple Events from Citrix plugin. This can be removed when <rdar://problem/14012823> is fixed.
+ setenv("__APPLEEVENTSSERVICENAME", "com.apple.coreservices.appleevents", 1);
+ }
}
void PluginProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
