Browse Source

Issue #1719 - Make <menuitem> pref-controlled and disable by default.

Resolves #1719
pull/24/head
Moonchild 2 years ago committed by roytam1
parent
commit
a828a5f321
  1. 6
      dom/html/HTMLMenuElement.cpp
  2. 14
      dom/html/HTMLMenuItemElement.cpp
  3. 3
      dom/html/test/browser_content_contextmenu_userinput.js
  4. 2
      dom/html/test/mochitest.ini
  5. 2
      dom/tests/mochitest/general/test_interfaces.html
  6. 1
      dom/tests/mochitest/webcomponents/htmlconstructor_builtin_tests.js
  7. 1
      dom/webidl/EventHandler.webidl
  8. 4
      dom/webidl/HTMLElement.webidl
  9. 4
      dom/webidl/HTMLMenuElement.webidl
  10. 2
      dom/webidl/HTMLMenuItemElement.webidl
  11. 6
      layout/style/res/html.css
  12. 3
      modules/libpref/init/all.js

6
dom/html/HTMLMenuElement.cpp

@ -137,9 +137,9 @@ HTMLMenuElement::ParseAttribute(int32_t aNamespaceID,
const nsAString& aValue,
nsAttrValue& aResult)
{
if (aNamespaceID == kNameSpaceID_None && aAttribute == nsGkAtoms::type) {
bool success = aResult.ParseEnumValue(aValue, kMenuTypeTable,
false);
if (aNamespaceID == kNameSpaceID_None && aAttribute == nsGkAtoms::type &&
Preferences::GetBool("dom.menuitem.enabled")) {
bool success = aResult.ParseEnumValue(aValue, kMenuTypeTable, false);
if (success) {
mType = aResult.GetEnumValue();
} else {

14
dom/html/HTMLMenuItemElement.cpp

@ -7,12 +7,22 @@
#include "mozilla/BasicEvents.h"
#include "mozilla/EventDispatcher.h"
#include "mozilla/Preferences.h"
#include "mozilla/dom/HTMLMenuItemElementBinding.h"
#include "mozilla/dom/HTMLUnknownElement.h"
#include "nsAttrValueInlines.h"
#include "nsContentUtils.h"
NS_IMPL_NS_NEW_HTML_ELEMENT_CHECK_PARSER(MenuItem)
nsGenericHTMLElement*
NS_NewHTMLMenuItemElement(already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
mozilla::dom::FromParser aFromParser) {
RefPtr<mozilla::dom::NodeInfo> nodeInfo(aNodeInfo);
if (mozilla::Preferences::GetBool("dom.menuitem.enabled")) {
return new mozilla::dom::HTMLMenuItemElement(nodeInfo.forget(), aFromParser);
} else {
return new mozilla::dom::HTMLUnknownElement(nodeInfo.forget());
}
}
namespace mozilla {
namespace dom {

3
dom/html/test/browser_content_contextmenu_userinput.js

@ -4,6 +4,9 @@ const kPage = "http://example.org/browser/" +
"dom/html/test/file_content_contextmenu.html";
add_task(function* () {
yield SpecialPowers.pushPrefEnv({
set: [["dom.menuitem.enabled", true]],
});
yield BrowserTestUtils.withNewTab({
gBrowser,
url: kPage

2
dom/html/test/mochitest.ini

@ -1,4 +1,6 @@
[DEFAULT]
prefs =
dom.menuitem.enabled=true # only for test_bug617528.html
support-files =
347174transform.xsl
347174transformable.xml

2
dom/tests/mochitest/general/test_interfaces.html

@ -496,8 +496,6 @@ var interfaceNamesInGlobalScope =
"HTMLMediaElement",
// IMPORTANT: Do not change this list without review from a DOM peer!
"HTMLMenuElement",
// IMPORTANT: Do not change this list without review from a DOM peer!
"HTMLMenuItemElement",
// IMPORTANT: Do not change this list without review from a DOM peer!
"HTMLMetaElement",
// IMPORTANT: Do not change this list without review from a DOM peer!

1
dom/tests/mochitest/webcomponents/htmlconstructor_builtin_tests.js

@ -72,7 +72,6 @@
['mark', ''],
['marquee', 'Div'],
['menu', 'Menu'],
['menuitem', 'MenuItem'],
['meta', 'Meta'],
['meter', 'Meter'],
['nav', ''],

1
dom/webidl/EventHandler.webidl

@ -82,6 +82,7 @@ interface GlobalEventHandlers {
attribute EventHandler onseeked;
attribute EventHandler onseeking;
attribute EventHandler onselect;
[Pref="dom.menuitem.enabled"]
attribute EventHandler onshow;
//(Not implemented)attribute EventHandler onsort;
attribute EventHandler onstalled;

4
dom/webidl/HTMLElement.webidl

@ -49,10 +49,8 @@ interface HTMLElement : Element {
attribute DOMString contentEditable;
[Pure]
readonly attribute boolean isContentEditable;
[Pure]
[Pure, Pref="dom.menuitem.enabled"]
readonly attribute HTMLMenuElement? contextMenu;
//[SetterThrows]
// attribute HTMLMenuElement? contextMenu;
[CEReactions, SetterThrows, Pure]
attribute boolean spellcheck;

4
dom/webidl/HTMLMenuElement.webidl

@ -17,9 +17,9 @@ interface MenuBuilder;
// http://www.whatwg.org/specs/web-apps/current-work/#the-menu-element
[HTMLConstructor]
interface HTMLMenuElement : HTMLElement {
[CEReactions, SetterThrows]
[CEReactions, SetterThrows, Pref="dom.menuitem.enabled"]
attribute DOMString type;
[CEReactions, SetterThrows]
[CEReactions, SetterThrows, Pref="dom.menuitem.enabled"]
attribute DOMString label;
};

2
dom/webidl/HTMLMenuItemElement.webidl

@ -12,7 +12,7 @@
*/
// http://www.whatwg.org/specs/web-apps/current-work/#the-menuitem-element
[HTMLConstructor]
[HTMLConstructor, Pref="dom.menuitem.enabled"]
interface HTMLMenuItemElement : HTMLElement {
[CEReactions, SetterThrows]
attribute DOMString type;

6
layout/style/res/html.css

@ -577,8 +577,10 @@ ul, menu, dir {
padding-inline-start: 40px;
}
menu[type="context"] {
display: none !important;
@supports -moz-bool-pref("dom.menuitem.enabled") {
menu[type="context"] {
display: none !important;
}
}
ol {

3
modules/libpref/init/all.js

@ -4984,6 +4984,9 @@ pref("dom.mozInputMethod.enabled", false);
// Enable mapped array buffer by default.
pref("dom.mapped_arraybuffer.enabled", true);
// Whether <menuitem> is a thing or not.
pref("dom.menuitem.enabled", false);
#ifdef MOZ_SAFE_BROWSING
// The tables used for Safebrowsing phishing and malware checks.
pref("urlclassifier.malwareTable", "goog-malware-shavar,goog-unwanted-shavar,test-malware-simple,test-unwanted-simple");

Loading…
Cancel
Save