commit 920a9fc53347f5a778a2d142326957381ed73198 Author: Bobby Holley <bobbyholley@gmail.com> Date: Mon Feb 10 14:07:26 2014 -0800 Bug 912322 - Sync pref from reftest-cmdline.js to bootstrap.js. r=jgriffin --- layout/reftests/bugs/reftest.list | 6 +++--- layout/tools/reftest/bootstrap.js | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list index a5a4512..d4424e4 100644 --- a/layout/reftests/bugs/reftest.list +++ b/layout/reftests/bugs/reftest.list @@ -1170,9 +1170,9 @@ fuzzy(127,2) == 448193.html 448193-ref.html # == 448987.html 448987-ref.html # Disabled for now - it needs privileges != 449149-1a.html about:blank != 449149-1b.html about:blank -# Retry the above with in-content XBL behavior -test-pref(dom.use_xbl_scopes_for_remote_xul,false) fails-if(Android) != 449149-1a.html about:blank -test-pref(dom.use_xbl_scopes_for_remote_xul,false) fails-if(Android) != 449149-1b.html about:blank +# Retry the above with XBL scopes +test-pref(dom.use_xbl_scopes_for_remote_xul,true) != 449149-1a.html about:blank +test-pref(dom.use_xbl_scopes_for_remote_xul,true) != 449149-1b.html about:blank == 449149-2.html 449149-2-ref.html == 449171-1.html 449171-ref.html == 449362-1.html 449362-1-ref.html diff --git a/layout/tools/reftest/bootstrap.js b/layout/tools/reftest/bootstrap.js index a6123fc..36ab76c 100644 --- a/layout/tools/reftest/bootstrap.js +++ b/layout/tools/reftest/bootstrap.js @@ -12,6 +12,11 @@ function setDefaultPrefs() { var prefs = Components.classes["@mozilla.org/preferences-service;1"]. getService(Components.interfaces.nsIPrefService); var branch = prefs.getDefaultBranch(""); + // For mochitests, we're more interested in testing the behavior of in- + // content XBL bindings, so we set this pref to true. In reftests, we're + // more interested in testing the behavior of XBL as it works in chrome, + // so we want this pref to be false. + branch.setBoolPref("dom.use_xbl_scopes_for_remote_xul", false); branch.setBoolPref("gfx.color_management.force_srgb", true); branch.setBoolPref("browser.dom.window.dump.enabled", true); branch.setIntPref("ui.caretBlinkTime", -1);