Bug 663259 - Disable 'plugins.use_layers' because of unresolved problems with GoogleTalk and Vidyo Flash hang. r=smichaud, a=LegNeato
authorBenoit Girard <b56girard@gmail.com>
Wed, 26 Oct 2011 18:51:42 -0400
changeset 79150 ac762e001967f21f64ecbfd43d3acb2ec657dd47
parent 79149 c8fcdb6bd4d72e5ddb3a705523aec176284692ea
child 79151 40aad4c14fbdb04c3f5aa8c88f38757fdf1493cc
push id78
push userclegnitto@mozilla.com
push dateFri, 16 Dec 2011 17:32:24 +0000
treeherdermozilla-release@79d24e644fdd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmichaud, LegNeato
bugs663259
milestone9.0a2
Bug 663259 - Disable 'plugins.use_layers' because of unresolved problems with GoogleTalk and Vidyo Flash hang. r=smichaud, a=LegNeato
browser/app/profile/firefox.js
dom/plugins/test/mochitest/utils.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -566,17 +566,17 @@ pref("accessibility.typeaheadfind.flashB
 // 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%&appRelease=%APP_RELEASE%");
 
 // by default we show an infobar message when pages require plugins the user has not installed, or are outdated
 pref("plugins.hide_infobar_for_missing_plugin", false);
 pref("plugins.hide_infobar_for_outdated_plugin", false);
 
 #ifdef XP_MACOSX
-pref("plugins.use_layers", true);
+pref("plugins.use_layers", false);
 pref("plugins.hide_infobar_for_carbon_failure_plugin", false);
 #endif
 
 pref("plugins.update.url", "https://www.mozilla.com/%LOCALE%/plugincheck/");
 pref("plugins.update.notifyUser", false);
 
 #ifdef XP_WIN
 pref("browser.preferences.instantApply", false);
--- a/dom/plugins/test/mochitest/utils.js
+++ b/dom/plugins/test/mochitest/utils.js
@@ -1,12 +1,13 @@
 function paintCountIs(plugin, expected, msg) {
   var count = plugin.getPaintCount();
   var realExpected = expected;
-  var isAsync = SimpleTest.testPluginIsOOP();
+  var isAsync = SimpleTest.testPluginIsOOP() &&
+    navigator.platform.indexOf("Mac") < 0;
   if (isAsync) {
     ++realExpected; // extra paint at startup for all async-rendering plugins
   } else {
     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
     try {
       if (Components.classes["@mozilla.org/gfx/info;1"].getService(Components.interfaces.nsIGfxInfo).D2DEnabled) {
         realExpected *= 2;
       }