Bug 1322938 - Basic implementation of HTMLDialogElement.

Tag #1343

7 files changed, 151 insertions, 0 deletions

diff --git a/dom/html/HTMLDialogElement.cpp b/dom/html/HTMLDialogElement.cpp
new file mode 100644
index 0000000000..1f796f9a6c
--- /dev/null
+++ b/dom/html/HTMLDialogElement.cpp
@@ -0,0 +1,65 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozilla/dom/HTMLDialogElement.h"
+#include "mozilla/dom/HTMLDialogElementBinding.h"
+
+NS_IMPL_NS_NEW_HTML_ELEMENT(Dialog)
+
+namespace mozilla {
+namespace dom {
+
+HTMLDialogElement::~HTMLDialogElement()
+{
+}
+
+NS_IMPL_ELEMENT_CLONE(HTMLDialogElement)
+
+void
+HTMLDialogElement::Close(const mozilla::dom::Optional<nsAString>& aReturnValue)
+{
+  if (!Open()) {
+    return;
+  }
+  if (aReturnValue.WasPassed()) {
+    SetReturnValue(aReturnValue.Value());
+  }
+  ErrorResult ignored;
+  SetOpen(false, ignored);
+  ignored.SuppressException();
+}
+
+void
+HTMLDialogElement::Show()
+{
+  if (Open()) {
+    return;
+  }
+  ErrorResult ignored;
+  SetOpen(true, ignored);
+  ignored.SuppressException();
+}
+
+void
+HTMLDialogElement::ShowModal(ErrorResult& aError)
+{
+  if (!IsInComposedDoc() || Open()) {
+   aError.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
+   return;
+  }
+
+  SetOpen(true, aError);
+  aError.SuppressException();
+}
+
+JSObject*
+HTMLDialogElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
+{
+  return HTMLDialogElementBinding::Wrap(aCx, this, aGivenProto);
+}
+
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/html/HTMLDialogElement.h b/dom/html/HTMLDialogElement.h
new file mode 100644
index 0000000000..7abaee81ca
--- /dev/null
+++ b/dom/html/HTMLDialogElement.h
@@ -0,0 +1,58 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef HTMLDialogElement_h
+#define HTMLDialogElement_h
+
+#include "mozilla/Attributes.h"
+#include "nsGenericHTMLElement.h"
+#include "nsGkAtoms.h"
+
+namespace mozilla {
+namespace dom {
+
+class HTMLDialogElement final : public nsGenericHTMLElement
+{
+public:
+  explicit HTMLDialogElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo) : nsGenericHTMLElement(aNodeInfo)
+  {
+  }
+
+  NS_IMPL_FROMCONTENT_HTML_WITH_TAG(HTMLDialogElement, dialog)
+
+  virtual nsresult Clone(mozilla::dom::NodeInfo* aNodeInfo, nsINode** aResult) const override;
+
+  bool Open() const { return GetBoolAttr(nsGkAtoms::open); }
+  void SetOpen(bool aOpen, ErrorResult& aError)
+  {
+    SetHTMLBoolAttr(nsGkAtoms::open, aOpen, aError);
+  }
+
+  void GetReturnValue(nsAString& aReturnValue)
+  {
+    aReturnValue = mReturnValue;
+  }
+  void SetReturnValue(const nsAString& aReturnValue)
+  {
+    mReturnValue = aReturnValue;
+  }
+
+  void Close(const mozilla::dom::Optional<nsAString>& aReturnValue);
+  void Show();
+  void ShowModal(ErrorResult& aError);
+
+  nsString mReturnValue;
+
+protected:
+  virtual ~HTMLDialogElement();
+  JSObject* WrapNode(JSContext* aCx,
+                     JS::Handle<JSObject*> aGivenProto) override;
+};
+
+} // namespace dom
+} // namespace mozilla
+
+#endif
diff --git a/dom/html/moz.build b/dom/html/moz.build
index c9879d1e6e..c86c169b5c 100644
--- a/dom/html/moz.build
+++ b/dom/html/moz.build
@@ -56,6 +56,7 @@ EXPORTS.mozilla.dom += [
     'HTMLDataElement.h',
     'HTMLDataListElement.h',
     'HTMLDetailsElement.h',
+    'HTMLDialogElement.h',
     'HTMLDivElement.h',
     'HTMLFieldSetElement.h',
     'HTMLFontElement.h',
@@ -134,6 +135,7 @@ UNIFIED_SOURCES += [
     'HTMLDataElement.cpp',
     'HTMLDataListElement.cpp',
     'HTMLDetailsElement.cpp',
+    'HTMLDialogElement.cpp',
     'HTMLDivElement.cpp',
     'HTMLElement.cpp',
     'HTMLFieldSetElement.cpp',
diff --git a/dom/html/nsGenericHTMLElement.h b/dom/html/nsGenericHTMLElement.h
index 24a7a36528..72039f2661 100644
--- a/dom/html/nsGenericHTMLElement.h
+++ b/dom/html/nsGenericHTMLElement.h
@@ -1654,6 +1654,7 @@ NS_DECLARE_NS_NEW_HTML_ELEMENT(Mod)
 NS_DECLARE_NS_NEW_HTML_ELEMENT(Data)
 NS_DECLARE_NS_NEW_HTML_ELEMENT(DataList)
 NS_DECLARE_NS_NEW_HTML_ELEMENT(Details)
+NS_DECLARE_NS_NEW_HTML_ELEMENT(Dialog)
 NS_DECLARE_NS_NEW_HTML_ELEMENT(Div)
 NS_DECLARE_NS_NEW_HTML_ELEMENT(FieldSet)
 NS_DECLARE_NS_NEW_HTML_ELEMENT(Font)
diff --git a/dom/tests/mochitest/general/test_interfaces.html b/dom/tests/mochitest/general/test_interfaces.html
index 98f3ffed0e..9208997be2 100644
--- a/dom/tests/mochitest/general/test_interfaces.html
+++ b/dom/tests/mochitest/general/test_interfaces.html
@@ -443,6 +443,8 @@ var interfaceNamesInGlobalScope =
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "HTMLDetailsElement",
 // IMPORTANT: Do not change this list without review from a DOM peer!
+    "HTMLDialogElement",
+// IMPORTANT: Do not change this list without review from a DOM peer!
     "HTMLDirectoryElement",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "HTMLDivElement",
diff --git a/dom/webidl/HTMLDialogElement.webidl b/dom/webidl/HTMLDialogElement.webidl
new file mode 100644
index 0000000000..f4aa8484ab
--- /dev/null
+++ b/dom/webidl/HTMLDialogElement.webidl
@@ -0,0 +1,22 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * The origin of this IDL file is
+ * https://html.spec.whatwg.org/multipage/forms.html#the-dialog-element
+ *
+ * © Copyright 2004-2011 Apple Computer, Inc., Mozilla Foundation, and
+ * Opera Software ASA. You are granted a license to use, reproduce
+ * and create derivative works of this document.
+ */
+
+interface HTMLDialogElement : HTMLElement {
+  [SetterThrows] attribute boolean open;
+  attribute DOMString returnValue;
+
+  void show();
+  [Throws] void showModal();
+
+  void close(optional DOMString returnValue);
+};
diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build
index 172895f978..4e3b8f655e 100644
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -184,6 +184,7 @@ WEBIDL_FILES = [
     'HTMLDataElement.webidl',
     'HTMLDataListElement.webidl',
     'HTMLDetailsElement.webidl',
+    'HTMLDialogElement.webidl',
     'HTMLDirectoryElement.webidl',
     'HTMLDivElement.webidl',
     'HTMLDListElement.webidl',