Port bug 621117 (Support native cursor manipulation from OOP plugins on OS X) to fix Mac build bustage - update package manifest and port the pref. blanket-rs=philor CLOSED TREE
authorMark Banner <bugzilla@standard8.plus.com>
Tue, 24 May 2011 19:03:42 +0100
changeset 7811 ab3ace782235d83e2d6e4bf17c4f50bdab808aab
parent 7810 0d1c875f3997f86ab5c26a351303bfe5c05867b6
child 7812 212a62f8c1ffca0d530bec530ec1bcecbf2623aa
push id4
push userbugzilla@standard8.plus.com
push dateTue, 24 May 2011 20:23:11 +0000
treeherdercomm-aurora@212a62f8c1ff [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs621117
Port bug 621117 (Support native cursor manipulation from OOP plugins on OS X) to fix Mac build bustage - update package manifest and port the pref. blanket-rs=philor CLOSED TREE
mail/app/profile/all-thunderbird.js
mail/installer/package-manifest.in
--- a/mail/app/profile/all-thunderbird.js
+++ b/mail/app/profile/all-thunderbird.js
@@ -679,13 +679,24 @@ pref("dom.ipc.plugins.enabled.i386.javaa
 // x86_64 ipc preferences
 pref("dom.ipc.plugins.enabled.x86_64", true);
 #elifdef MOZ_IPC
 pref("dom.ipc.plugins.enabled", true);
 #else
 pref("dom.ipc.plugins.enabled", false);
 #endif
 
+// This pref governs whether we attempt to work around problems caused by
+// plugins using OS calls to manipulate the cursor while running out-of-
+// process.  These workarounds all involve intercepting (hooking) certain
+// OS calls in the plugin process, then arranging to make certain OS calls
+// in the browser process.  Eventually plugins will be required to use the
+// NPAPI to manipulate the cursor, and these workarounds will be removed.
+// See bug 621117.
+#ifdef XP_MACOSX
+pref("dom.ipc.plugins.nativeCursorSupport", true);
+#endif
+
 // Windows taskbar support
 #ifdef XP_WIN
 pref("mail.taskbar.lists.enabled", true);
 pref("mail.taskbar.lists.tasks.enabled", true);
 #endif
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -68,16 +68,17 @@
 #ifdef XP_MACOSX
 @BINPATH@/XUL
 #else
 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
 #endif
 #ifdef MOZ_IPC
 #ifdef XP_MACOSX
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
+@BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_Suffix@
 #else
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
 #endif
 #endif
 ; ANGLE GLES-on-D3D rendering library
 #ifdef MOZ_ANGLE
 @BINPATH@/libEGL.dll
 @BINPATH@/libGLESv2.dll