summaryrefslogtreecommitdiffstats
path: root/dom
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-04-17 07:44:11 -0400
committerMatt A. Tobin <email@mattatobin.com>2020-04-17 07:44:11 -0400
commitf35aa3e15fedf3cd4ad163d60ab74a9537ca5c82 (patch)
tree255873c3bed228e772d9854eb0edea0a44b3a853 /dom
parent80c024779929d44397a8c03d2fa7808f97f2c21a (diff)
downloadUXP-f35aa3e15fedf3cd4ad163d60ab74a9537ca5c82.tar
UXP-f35aa3e15fedf3cd4ad163d60ab74a9537ca5c82.tar.gz
UXP-f35aa3e15fedf3cd4ad163d60ab74a9537ca5c82.tar.lz
UXP-f35aa3e15fedf3cd4ad163d60ab74a9537ca5c82.tar.xz
UXP-f35aa3e15fedf3cd4ad163d60ab74a9537ca5c82.zip
Issue #1375 - Merge CustomElements pref with Webcomponents Pref
Diffstat (limited to 'dom')
-rw-r--r--dom/base/crashtests/crashtests.list2
-rw-r--r--dom/base/nsContentUtils.cpp2
-rw-r--r--dom/tests/mochitest/webcomponents/test_bug1276240.html2
3 files changed, 3 insertions, 3 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>