diff options
| -rw-r--r-- | dom/base/crashtests/crashtests.list | 2 | ||||
| -rw-r--r-- | dom/base/nsContentUtils.cpp | 2 | ||||
| -rw-r--r-- | dom/tests/mochitest/webcomponents/test_bug1276240.html | 2 | ||||
| -rw-r--r-- | modules/libpref/init/all.js | 1 | ||||
| -rw-r--r-- | testing/profiles/prefs_general.js | 3 |
5 files changed, 4 insertions, 6 deletions
diff --git a/dom/base/crashtests/crashtests.list b/dom/base/crashtests/crashtests.list index d451d9384..40d358b38 100644 --- a/dom/base/crashtests/crashtests.list +++ b/dom/base/crashtests/crashtests.list @@ -209,6 +209,6 @@ load 1230422.html load 1251361.html load 1304437.html pref(clipboard.autocopy,true) load 1385272-1.html -pref(dom.webcomponents.customelements.enabled,true) load 1341693.html +pref(dom.webcomponents.enabled,true) load 1341693.html pref(dom.webcomponents.enabled,true) load 1419799.html pref(dom.webcomponents.enabled,false) load 1422931.html diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index d28b34f3d..c0d81a41e 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -593,7 +593,7 @@ nsContentUtils::Init() "dom.webcomponents.enabled", false); Preferences::AddBoolVarCache(&sIsCustomElementsEnabled, - "dom.webcomponents.customelements.enabled", false); + "dom.webcomponents.enabled", false); Preferences::AddBoolVarCache(&sEncodeDecodeURLHash, "dom.url.encode_decode_hash", false); diff --git a/dom/tests/mochitest/webcomponents/test_bug1276240.html b/dom/tests/mochitest/webcomponents/test_bug1276240.html index ded8d8276..33e532a6a 100644 --- a/dom/tests/mochitest/webcomponents/test_bug1276240.html +++ b/dom/tests/mochitest/webcomponents/test_bug1276240.html @@ -47,7 +47,7 @@ test(); // test with webcomponents disabled SimpleTest.waitForExplicitFinish(); SpecialPowers.pushPrefEnv( - { 'set': [["dom.webcomponents.customelements.enabled", false]]}, runTest); + { 'set': [["dom.webcomponents.enabled", false]]}, runTest); </script> </pre> diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 2e21c307d..e2282398e 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -1251,7 +1251,6 @@ pref("dom.event.clipboardevents.enabled", true); pref("dom.event.highrestimestamp.enabled", false); pref("dom.webcomponents.enabled", false); -pref("dom.webcomponents.customelements.enabled", false); pref("javascript.enabled", true); // Enable Array.prototype.values diff --git a/testing/profiles/prefs_general.js b/testing/profiles/prefs_general.js index 960cbda15..c90806a4d 100644 --- a/testing/profiles/prefs_general.js +++ b/testing/profiles/prefs_general.js @@ -57,7 +57,6 @@ user_pref("media.gmp-manager.updateEnabled", false); user_pref("dom.w3c_touch_events.enabled", 1); user_pref("layout.accessiblecaret.enabled_on_touch", false); user_pref("dom.webcomponents.enabled", true); -user_pref("dom.webcomponents.customelements.enabled", true); user_pref("dom.htmlimports.enabled", true); // Existing tests assume there is no font size inflation. user_pref("font.size.inflation.emPerLine", 0); @@ -329,4 +328,4 @@ user_pref("plugin.load_flash_only", false); // cannot easily be upgraded. user_pref("media.libavcodec.allow-obsolete", true); -user_pref("media.openUnsupportedTypeWithExternalApp", false);
\ No newline at end of file +user_pref("media.openUnsupportedTypeWithExternalApp", false); |