Bug 1322938 - Put <dialog> element behind preference.

Tag #1343
This commit is contained in:
Gaming4JC 2020-01-07 09:10:56 -05:00 • committed by Roy Tam
commit a77fa3ec13
11 changed files with 45 additions and 5 deletions

View file

@ -6,8 +6,20 @@
#include "mozilla/dom/HTMLDialogElement.h" #include "mozilla/dom/HTMLDialogElement.h"
#include "mozilla/dom/HTMLDialogElementBinding.h" #include "mozilla/dom/HTMLDialogElementBinding.h"
#include "mozilla/dom/HTMLUnknownElement.h"
#include "mozilla/Preferences.h"
NS_IMPL_NS_NEW_HTML_ELEMENT(Dialog) // Expand NS_IMPL_NS_NEW_HTML_ELEMENT(Dialog) with pref check
nsGenericHTMLElement*
NS_NewHTMLDialogElement(already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
mozilla::dom::FromParser aFromParser)
{
if (!mozilla::dom::HTMLDialogElement::IsDialogEnabled()) {
return new mozilla::dom::HTMLUnknownElement(aNodeInfo);
}
return new mozilla::dom::HTMLDialogElement(aNodeInfo);
}
namespace mozilla { namespace mozilla {
namespace dom { namespace dom {
@ -18,6 +30,21 @@ HTMLDialogElement::~HTMLDialogElement()
NS_IMPL_ELEMENT_CLONE(HTMLDialogElement) NS_IMPL_ELEMENT_CLONE(HTMLDialogElement)
bool
HTMLDialogElement::IsDialogEnabled()
{
static bool isDialogEnabled = false;
static bool added = false;
if (!added) {
Preferences::AddBoolVarCache(&isDialogEnabled,
"dom.dialog_element.enabled");
added = true;
}
return isDialogEnabled;
}
void void
HTMLDialogElement::Close(const mozilla::dom::Optional<nsAString>& aReturnValue) HTMLDialogElement::Close(const mozilla::dom::Optional<nsAString>& aReturnValue)
{ {

View file

@ -26,6 +26,8 @@ public:
virtual nsresult Clone(mozilla::dom::NodeInfo* aNodeInfo, nsINode** aResult) const override; virtual nsresult Clone(mozilla::dom::NodeInfo* aNodeInfo, nsINode** aResult) const override;
static bool IsDialogEnabled();
bool Open() const { return GetBoolAttr(nsGkAtoms::open); } bool Open() const { return GetBoolAttr(nsGkAtoms::open); }
void SetOpen(bool aOpen, ErrorResult& aError) void SetOpen(bool aOpen, ErrorResult& aError)
{ {

View file

@ -443,7 +443,7 @@ var interfaceNamesInGlobalScope =
// IMPORTANT: Do not change this list without review from a DOM peer! // IMPORTANT: Do not change this list without review from a DOM peer!
"HTMLDetailsElement", "HTMLDetailsElement",
// IMPORTANT: Do not change this list without review from a DOM peer! // IMPORTANT: Do not change this list without review from a DOM peer!
"HTMLDialogElement", {name: "HTMLDialogElement", disabled: true},
// IMPORTANT: Do not change this list without review from a DOM peer! // IMPORTANT: Do not change this list without review from a DOM peer!
"HTMLDirectoryElement", "HTMLDirectoryElement",
// IMPORTANT: Do not change this list without review from a DOM peer! // IMPORTANT: Do not change this list without review from a DOM peer!

View file

@ -11,6 +11,7 @@
* and create derivative works of this document. * and create derivative works of this document.
*/ */
[Pref="dom.dialog_element.enabled"]
interface HTMLDialogElement : HTMLElement { interface HTMLDialogElement : HTMLElement {
[SetterThrows] attribute boolean open; [SetterThrows] attribute boolean open;
attribute DOMString returnValue; attribute DOMString returnValue;

View file

@ -5368,6 +5368,9 @@ pref("narrate.filter-voices", true);
pref("dom.audiochannel.mutedByDefault", false); pref("dom.audiochannel.mutedByDefault", false);
// HTML <dialog> element
pref("dom.dialog_element.enabled", false);
// Enable <details> and <summary> tags. // Enable <details> and <summary> tags.
pref("dom.details_element.enabled", true); pref("dom.details_element.enabled", true);

View file

@ -1,6 +1,6 @@
[interfaces.html] [interfaces.html]
type: testharness type: testharness
prefs: [dom.forms.inputmode:true, dom.details_element.enabled:true] prefs: [dom.forms.inputmode:true, dom.details_element.enabled:true, dom.dialog_element.enabled:true]
[Document interface: attribute domain] [Document interface: attribute domain]
expected: FAIL expected: FAIL

View file

@ -1,6 +1,6 @@
[reflection-misc.html] [reflection-misc.html]
type: testharness type: testharness
prefs: [dom.details_element.enabled:true] prefs: [dom.details_element.enabled: true, dom.dialog_element.enabled: true]
[html.tabIndex: setAttribute() to object "3" followed by getAttribute()] [html.tabIndex: setAttribute() to object "3" followed by getAttribute()]
expected: FAIL expected: FAIL

View file

@ -0,0 +1,3 @@
[dialog-close.html]
type: testharness
prefs: [dom.dialog_element.enabled:true]

View file

@ -0,0 +1,3 @@
[dialog-open.html]
type: testharness
prefs: [dom.dialog_element.enabled:true]

View file

@ -1,5 +1,6 @@
[dialog-showModal.html] [dialog-showModal.html]
type: testharness type: testharness
prefs: [dom.dialog_element.enabled:true]
[dialog element: showModal()] [dialog element: showModal()]
expected: FAIL expected: FAIL

View file

@ -1,6 +1,6 @@
[interfaces.html] [interfaces.html]
type: testharness type: testharness
prefs: [dom.details_element.enabled:true] prefs: [dom.details_element.enabled: true, dom.dialog_element.enabled: true]
[Interfaces for image] [Interfaces for image]
expected: FAIL expected: FAIL