From 37d09da24e6c97e3f05ad344893f9b9513ba58ff Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Mon, 20 Jan 2020 19:11:20 -0500 Subject: Bug 1400762 - Make dom.webcomponents.enabled pref doesn't control CustomElements feature Tag UXP Issue #1344 --- dom/base/CustomElementRegistry.cpp | 3 +-- dom/base/crashtests/crashtests.list | 2 +- dom/tests/mochitest/webcomponents/test_bug1276240.html | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dom/base/CustomElementRegistry.cpp b/dom/base/CustomElementRegistry.cpp index 830f06fedf..3d5432b079 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 391557b0ef..0fb597b306 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 33e532a6a7..ded8d82763 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); -- cgit v1.2.3