Bug 660581 Packaging fixes for TelemetryPing (Bug 585196) and native cursor manipulation from OOP plugins on OS X (Bug 621117). r=Callek a=Callek
authorPhilip Chee <philip.chee@gmail.com>
Sun, 12 Jun 2011 23:22:37 +0800
changeset 10220 48b34c3d35b6d854e67a7836c85422350bcc7775
parent 10219 0c7f86ea92f73ec8ce78149f402b4f20889c8814
child 10221 54a07d87ea36faa2b5147994460d683073e7e1d6
push id6
push userbienvenu@nventure.com
push dateWed, 16 May 2012 22:24:51 +0000
treeherdertry-comm-central@ac395aea3008 [default view] [failures only]
reviewersCallek, Callek
bugs660581, 585196, 621117
Bug 660581 Packaging fixes for TelemetryPing (Bug 585196) and native cursor manipulation from OOP plugins on OS X (Bug 621117). r=Callek a=Callek CLOSED TREE
suite/browser/browser-prefs.js
suite/installer/package-manifest.in
--- a/suite/browser/browser-prefs.js
+++ b/suite/browser/browser-prefs.js
@@ -681,16 +681,25 @@ pref("dom.event.contextmenu.enabled",  t
 #ifdef XP_MACOSX
 // i386 IPC preferences
 pref("dom.ipc.plugins.enabled.i386", false);
 pref("dom.ipc.plugins.enabled.i386.flash player.plugin", true);
 pref("dom.ipc.plugins.enabled.i386.javaplugin2_npapi.plugin", true);
 pref("dom.ipc.plugins.enabled.i386.javaappletplugin.plugin", true);
 // x86_64 ipc preferences
 pref("dom.ipc.plugins.enabled.x86_64", true);
+
+// 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.
+pref("dom.ipc.plugins.nativeCursorSupport", true);
 #elifdef MOZ_IPC
 pref("dom.ipc.plugins.enabled", true);
 #else
 pref("dom.ipc.plugins.enabled", false);
 #endif
 
 // plugin finder service url
 pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%");
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -56,16 +56,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
@@ -419,16 +420,18 @@
 @BINPATH@/components/nsWebHandlerApp.manifest
 @BINPATH@/components/passwordmgr.manifest
 @BINPATH@/components/PlacesCategoriesStarter.js
 @BINPATH@/components/pluginGlue.manifest
 @BINPATH@/components/smileApplication.js
 @BINPATH@/components/smileApplication.manifest
 @BINPATH@/components/storage-Legacy.js
 @BINPATH@/components/storage-mozStorage.js
+@BINPATH@/components/TelemetryPing.js
+@BINPATH@/components/TelemetryPing.manifest
 @BINPATH@/components/txEXSLTRegExFunctions.js
 @BINPATH@/components/txEXSLTRegExFunctions.manifest
 @BINPATH@/components/WebContentConverter.js
 @BINPATH@/components/nsAboutSyncTabs.js
 @BINPATH@/components/SyncComponents.manifest
 @BINPATH@/components/Weave.js
 
 ; Modules