summaryrefslogtreecommitdiffstats
path: root/dom
diff options
context:
space:
mode:
authorGaming4JC <g4jc@hyperbola.info>2020-01-20 19:11:20 -0500
committerGaming4JC <g4jc@hyperbola.info>2020-01-26 15:50:47 -0500
commit37d09da24e6c97e3f05ad344893f9b9513ba58ff (patch)
treec94fd67974b98bab09e6abfef0dfb7f1874691ed /dom
parent7e9efb0f27d2ce3475deac31a8f8dd45213d09a9 (diff)
downloadUXP-37d09da24e6c97e3f05ad344893f9b9513ba58ff.tar
UXP-37d09da24e6c97e3f05ad344893f9b9513ba58ff.tar.gz
UXP-37d09da24e6c97e3f05ad344893f9b9513ba58ff.tar.lz
UXP-37d09da24e6c97e3f05ad344893f9b9513ba58ff.tar.xz
UXP-37d09da24e6c97e3f05ad344893f9b9513ba58ff.zip
Bug 1400762 - Make dom.webcomponents.enabled pref doesn't control CustomElements feature
Tag UXP Issue #1344
Diffstat (limited to 'dom')
-rw-r--r--dom/base/CustomElementRegistry.cpp3
-rw-r--r--dom/base/crashtests/crashtests.list2
-rw-r--r--dom/tests/mochitest/webcomponents/test_bug1276240.html2
3 files changed, 3 insertions, 4 deletions
diff --git a/dom/base/CustomElementRegistry.cpp b/dom/base/CustomElementRegistry.cpp
index 830f06fed..3d5432b07 100644
--- a/dom/base/CustomElementRegistry.cpp
+++ b/dom/base/CustomElementRegistry.cpp
@@ -258,8 +258,7 @@ NS_INTERFACE_MAP_END
/* static */ bool
CustomElementRegistry::IsCustomElementEnabled(JSContext* aCx, JSObject* aObject)
{
- return nsContentUtils::IsCustomElementsEnabled() ||
- nsContentUtils::IsWebComponentsEnabled();
+ return nsContentUtils::IsCustomElementsEnabled();
}
CustomElementRegistry::CustomElementRegistry(nsPIDOMWindowInner* aWindow)
diff --git a/dom/base/crashtests/crashtests.list b/dom/base/crashtests/crashtests.list
index 391557b0e..0fb597b30 100644
--- a/dom/base/crashtests/crashtests.list
+++ b/dom/base/crashtests/crashtests.list
@@ -209,4 +209,4 @@ load 1230422.html
load 1251361.html
load 1304437.html
pref(clipboard.autocopy,true) load 1385272-1.html
-pref(dom.webcomponents.enabled,true) load 1341693.html
+pref(dom.webcomponents.customelements.enabled,true) load 1341693.html
diff --git a/dom/tests/mochitest/webcomponents/test_bug1276240.html b/dom/tests/mochitest/webcomponents/test_bug1276240.html
index 33e532a6a..ded8d8276 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.enabled", false]]}, runTest);
+ { 'set': [["dom.webcomponents.customelements.enabled", false]]}, runTest);
</script>
</pre>