Bug 1055467 - Rename MozNamedAttrMap to NamedNodeMap, r=smaug

--HG--
rename : dom/webidl/MozNamedAttrMap.webidl => dom/webidl/NamedNodeMap.webidl

browser/devtools/webconsole/test/browser_webconsole_output_03.js

@@ -73,10 +73,10 @@ let inputTests = [
   // 7
   {
     input: "document.body.attributes",
-    output: "MozNamedAttrMap [  ]",
-    printOutput: "[object MozNamedAttrMap]",
+    output: "NamedNodeMap [  ]",
+    printOutput: "[object NamedNodeMap]",
     inspectable: true,
-    variablesViewLabel: "MozNamedAttrMap[0]",
+    variablesViewLabel: "NamedNodeMap[0]",
   },
 
   // 8
@@ -137,11 +137,11 @@ let inputTests = [
   // 14
   {
     input: "document.body.attributes",
-    output: 'MozNamedAttrMap [ class="test1 tezt2", id="foobarid", ' +
+    output: 'NamedNodeMap [ class="test1 tezt2", id="foobarid", ' +
             'data-preview="zuzu"<a>foo" ]',
-    printOutput: "[object MozNamedAttrMap]",
+    printOutput: "[object NamedNodeMap]",
     inspectable: true,
-    variablesViewLabel: "MozNamedAttrMap[3]",
+    variablesViewLabel: "NamedNodeMap[3]",
   },
 
   // 15

content/base/src/nsDOMAttributeMap.cpp

@@ -12,7 +12,7 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/dom/Attr.h"
 #include "mozilla/dom/Element.h"
-#include "mozilla/dom/MozNamedAttrMapBinding.h"
+#include "mozilla/dom/NamedNodeMapBinding.h"
 #include "nsAttrName.h"
 #include "nsContentUtils.h"
 #include "nsError.h"
@@ -561,5 +561,5 @@ nsDOMAttributeMap::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const
 /* virtual */ JSObject*
 nsDOMAttributeMap::WrapObject(JSContext* aCx)
 {
-  return MozNamedAttrMapBinding::Wrap(aCx, this);
+  return NamedNodeMapBinding::Wrap(aCx, this);
 }

dom/bindings/Bindings.conf

@@ -859,10 +859,6 @@ DOMInterfaces = {
     'nativeType': 'mozilla::dom::MobileNetworkInfo',
 },
 
-'MozNamedAttrMap': {
-    'nativeType': 'nsDOMAttributeMap',
-},
-
 'MozSpeakerManager': {
     'nativeType': 'mozilla::dom::SpeakerManager',
     'headerFile': 'SpeakerManager.h'
@@ -895,6 +891,10 @@ DOMInterfaces = {
                            'previousSibling', 'nextSibling' ]
 },
 
+'NamedNodeMap': {
+    'nativeType': 'nsDOMAttributeMap',
+},
+
 'NetworkInformation': {
     'nativeType': 'mozilla::dom::network::Connection',
 },

dom/imptests/html/dom/test_historical.html

@@ -21,7 +21,6 @@ var nukedInterfaces = [
   "Entity",
   "EntityReference",
   "EventException", // DOM Events
-  "NamedNodeMap",
   "NameList",
   "Notation",
   "TypeInfo",

dom/tests/mochitest/general/test_interfaces.html

@@ -686,8 +686,6 @@ var interfaceNamesInGlobalScope =
     {name: "MozMobileMessageManager", b2g: true, pref: "dom.sms.enabled"},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "MozMobileMessageThread",
-// IMPORTANT: Do not change this list without review from a DOM peer!
-    "MozNamedAttrMap",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "MozNDEFRecord", b2g: true},
 // IMPORTANT: Do not change this list without review from a DOM peer!
@@ -752,6 +750,8 @@ var interfaceNamesInGlobalScope =
     "MutationObserver",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "MutationRecord",
+// IMPORTANT: Do not change this list without review from a DOM peer!
+    "NamedNodeMap",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "Navigator",
 // IMPORTANT: Do not change this list without review from a DOM peer!

dom/webidl/Element.webidl

@@ -34,7 +34,7 @@ interface Element : Node {
   readonly attribute DOMTokenList classList;
 
   [SameObject]
-  readonly attribute MozNamedAttrMap attributes;
+  readonly attribute NamedNodeMap attributes;
   [Pure]
   DOMString? getAttribute(DOMString name);
   [Pure]

dom/webidl/LegacyQueryInterface.webidl

@@ -41,7 +41,7 @@ FormData implements LegacyQueryInterface;
 HTMLCollection implements LegacyQueryInterface;
 History implements LegacyQueryInterface;
 MimeTypeArray implements LegacyQueryInterface;
-MozNamedAttrMap implements LegacyQueryInterface;
+NamedNodeMap implements LegacyQueryInterface;
 MutationObserver implements LegacyQueryInterface;
 MutationRecord implements LegacyQueryInterface;
 Navigator implements LegacyQueryInterface;

dom/webidl/NamedNodeMap.webidl

@@ -3,11 +3,7 @@
  * 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/. */
 
-/**
- * This is a temporary, non-standard interface, to ease the transition to a
- * world where Attr no longer inherits from Node.
- */
-interface MozNamedAttrMap {
+interface NamedNodeMap {
   getter Attr? getNamedItem(DOMString name);
   [Throws]
   Attr? setNamedItem(Attr arg);

dom/webidl/moz.build

@@ -262,7 +262,6 @@ WEBIDL_FILES = [
     'MozActivity.webidl',
     'MozMmsMessage.webidl',
     'MozMobileMessageManager.webidl',
-    'MozNamedAttrMap.webidl',
     'MozPowerManager.webidl',
     'MozSelfSupport.webidl',
     'MozTetheringManager.webidl',
@@ -270,6 +269,7 @@ WEBIDL_FILES = [
     'MozWakeLock.webidl',
     'MutationEvent.webidl',
     'MutationObserver.webidl',
+    'NamedNodeMap.webidl',
     'NativeOSFileInternals.webidl',
     'NetDashboard.webidl',
     'NetworkInformation.webidl',

xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp

@@ -245,7 +245,7 @@
 #include "mozilla/dom/MouseEventBinding.h"
 #include "mozilla/dom/MouseScrollEventBinding.h"
 #include "mozilla/dom/MutationEventBinding.h"
-#include "mozilla/dom/MozNamedAttrMapBinding.h"
+#include "mozilla/dom/NamedNodeMapBinding.h"
 #include "mozilla/dom/NodeIteratorBinding.h"
 #include "mozilla/dom/NodeBinding.h"
 #include "mozilla/dom/NotifyPaintEventBinding.h"
@@ -434,7 +434,7 @@ const ComponentsInterfaceShimEntry kComponentsInterfaceShimMap[] =
   DEFINE_SHIM(MouseEvent),
   DEFINE_SHIM(MouseScrollEvent),
   DEFINE_SHIM(MutationEvent),
-  DEFINE_SHIM(MozNamedAttrMap),
+  DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIDOMMozNamedAttrMap, NamedNodeMap),
   DEFINE_SHIM(NodeIterator),
   DEFINE_SHIM(Node),
   DEFINE_SHIM(NotifyPaintEvent),