From 1689cf025ed1bf3606c765b31f1491d16c2bebba Mon Sep 17 00:00:00 2001 From: Bill McCloskey Date: Fri, 8 Mar 2013 18:53:06 -0800 Subject: [PATCH] Bug 846890 - Disable security.fileuri.strict_origin_policy for reftests (r=dbaron,dholbert) --- layout/reftests/svg/reftest.list | 5 ++++- layout/tools/reftest/reftest-cmdline.js | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/layout/reftests/svg/reftest.list b/layout/reftests/svg/reftest.list index d7c4396d3c8..2c88d8c861e 100644 --- a/layout/reftests/svg/reftest.list +++ b/layout/reftests/svg/reftest.list @@ -142,7 +142,10 @@ skip-if(B2G) == use-01-extref.svg pass.svg == filter-basic-03.svg pass.svg == filter-bounds-01.svg pass.svg == filter-bounds-02.svg pass.svg -fails-if(Android||B2G) == filter-extref-differentOrigin-01.svg pass.svg # Bug 695385 +# This pref is normally on by default, but we turn it off in reftest runs to +# disable an unnecessary security-check. This reftest is actually testing that +# the security check works, though, so it needs the pref to be turned on: +fails-if(Android||B2G) pref(security.fileuri.strict_origin_policy,true) == filter-extref-differentOrigin-01.svg pass.svg # Bug 695385 == filter-foreignObject-01.svg pass.svg == filter-in-mask-01.svg pass.svg skip-if(B2G) == filter-invalidation-01.svg pass.svg diff --git a/layout/tools/reftest/reftest-cmdline.js b/layout/tools/reftest/reftest-cmdline.js index af4b7433a6b..0f7c67bf6a8 100644 --- a/layout/tools/reftest/reftest-cmdline.js +++ b/layout/tools/reftest/reftest-cmdline.js @@ -97,6 +97,9 @@ RefTestCmdLineHandler.prototype = branch.setIntPref("urlclassifier.updateinterval", 172800); // Disable high-quality downscaling, since it makes reftests more difficult. branch.setBoolPref("image.high_quality_downscaling.enabled", false); + // Checking whether two files are the same is slow on Windows. + // Setting this pref makes tests run much faster there. + branch.setBoolPref("security.fileuri.strict_origin_policy", false); var wwatch = Components.classes["@mozilla.org/embedcomp/window-watcher;1"] .getService(nsIWindowWatcher);