From 4ec472b4504f23e2fd214c0978f301054baf31dc Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Sun, 17 Mar 2013 09:51:34 +0100 Subject: [PATCH] Bug 844134 - Move the 'attributes' property from Node to Element; r=sicking --- content/base/public/Element.h | 7 ++-- content/base/public/nsINode.h | 6 ---- content/base/src/Element.cpp | 7 ---- content/base/src/nsINode.cpp | 8 ----- .../tests/approved/test_interfaces.html.json | 1 - dom/interfaces/core/nsIDOMAttr.idl | 2 +- dom/interfaces/core/nsIDOMCDATASection.idl | 2 +- dom/interfaces/core/nsIDOMCharacterData.idl | 2 +- dom/interfaces/core/nsIDOMComment.idl | 2 +- dom/interfaces/core/nsIDOMDocument.idl | 2 +- .../core/nsIDOMDocumentFragment.idl | 2 +- dom/interfaces/core/nsIDOMDocumentType.idl | 2 +- dom/interfaces/core/nsIDOMElement.idl | 5 ++- dom/interfaces/core/nsIDOMNode.idl | 4 +-- .../core/nsIDOMProcessingInstruction.idl | 2 +- dom/interfaces/core/nsIDOMText.idl | 2 +- dom/interfaces/core/nsIDOMXMLDocument.idl | 2 +- .../html/nsIDOMHTMLAnchorElement.idl | 2 +- .../html/nsIDOMHTMLAppletElement.idl | 2 +- dom/interfaces/html/nsIDOMHTMLAreaElement.idl | 2 +- .../html/nsIDOMHTMLAudioElement.idl | 2 +- dom/interfaces/html/nsIDOMHTMLBRElement.idl | 2 +- dom/interfaces/html/nsIDOMHTMLBaseElement.idl | 2 +- dom/interfaces/html/nsIDOMHTMLBodyElement.idl | 2 +- .../html/nsIDOMHTMLButtonElement.idl | 2 +- .../html/nsIDOMHTMLCanvasElement.idl | 2 +- .../html/nsIDOMHTMLCommandElement.idl | 2 +- .../html/nsIDOMHTMLDListElement.idl | 2 +- .../html/nsIDOMHTMLDataListElement.idl | 2 +- .../html/nsIDOMHTMLDirectoryElement.idl | 2 +- dom/interfaces/html/nsIDOMHTMLDivElement.idl | 2 +- dom/interfaces/html/nsIDOMHTMLDocument.idl | 2 +- dom/interfaces/html/nsIDOMHTMLElement.idl | 2 +- .../html/nsIDOMHTMLEmbedElement.idl | 2 +- .../html/nsIDOMHTMLFieldSetElement.idl | 2 +- dom/interfaces/html/nsIDOMHTMLFontElement.idl | 2 +- dom/interfaces/html/nsIDOMHTMLFormElement.idl | 2 +- .../html/nsIDOMHTMLFrameElement.idl | 2 +- .../html/nsIDOMHTMLFrameSetElement.idl | 2 +- dom/interfaces/html/nsIDOMHTMLHRElement.idl | 2 +- dom/interfaces/html/nsIDOMHTMLHeadElement.idl | 2 +- .../html/nsIDOMHTMLHeadingElement.idl | 2 +- dom/interfaces/html/nsIDOMHTMLHtmlElement.idl | 2 +- .../html/nsIDOMHTMLIFrameElement.idl | 2 +- .../html/nsIDOMHTMLImageElement.idl | 2 +- .../html/nsIDOMHTMLInputElement.idl | 2 +- dom/interfaces/html/nsIDOMHTMLLIElement.idl | 2 +- .../html/nsIDOMHTMLLabelElement.idl | 2 +- .../html/nsIDOMHTMLLegendElement.idl | 2 +- dom/interfaces/html/nsIDOMHTMLLinkElement.idl | 2 +- dom/interfaces/html/nsIDOMHTMLMapElement.idl | 2 +- .../html/nsIDOMHTMLMediaElement.idl | 2 +- dom/interfaces/html/nsIDOMHTMLMenuElement.idl | 2 +- .../html/nsIDOMHTMLMenuItemElement.idl | 2 +- dom/interfaces/html/nsIDOMHTMLMetaElement.idl | 2 +- .../html/nsIDOMHTMLMeterElement.idl | 2 +- dom/interfaces/html/nsIDOMHTMLModElement.idl | 2 +- .../html/nsIDOMHTMLOListElement.idl | 2 +- .../html/nsIDOMHTMLObjectElement.idl | 2 +- .../html/nsIDOMHTMLOptGroupElement.idl | 2 +- .../html/nsIDOMHTMLOptionElement.idl | 2 +- .../html/nsIDOMHTMLOutputElement.idl | 2 +- .../html/nsIDOMHTMLParagraphElement.idl | 2 +- .../html/nsIDOMHTMLParamElement.idl | 2 +- dom/interfaces/html/nsIDOMHTMLPreElement.idl | 2 +- .../html/nsIDOMHTMLProgressElement.idl | 2 +- .../html/nsIDOMHTMLQuoteElement.idl | 2 +- .../html/nsIDOMHTMLScriptElement.idl | 2 +- .../html/nsIDOMHTMLSelectElement.idl | 2 +- .../html/nsIDOMHTMLSourceElement.idl | 2 +- .../html/nsIDOMHTMLStyleElement.idl | 2 +- .../html/nsIDOMHTMLTableCaptionElem.idl | 2 +- .../html/nsIDOMHTMLTableCellElement.idl | 2 +- .../html/nsIDOMHTMLTableColElement.idl | 2 +- .../html/nsIDOMHTMLTableElement.idl | 2 +- .../html/nsIDOMHTMLTableRowElement.idl | 2 +- .../html/nsIDOMHTMLTableSectionElement.idl | 2 +- .../html/nsIDOMHTMLTextAreaElement.idl | 2 +- .../html/nsIDOMHTMLTitleElement.idl | 2 +- .../html/nsIDOMHTMLUListElement.idl | 2 +- .../html/nsIDOMHTMLUnknownElement.idl | 2 +- .../html/nsIDOMHTMLVideoElement.idl | 2 +- dom/interfaces/svg/nsIDOMSVGDocument.idl | 2 +- dom/interfaces/svg/nsIDOMSVGElement.idl | 2 +- dom/interfaces/svg/nsIDOMSVGFilters.idl | 34 +++++++++---------- dom/interfaces/xpath/nsIDOMXPathNamespace.idl | 2 +- dom/interfaces/xul/nsIDOMXULButtonElement.idl | 2 +- .../xul/nsIDOMXULCheckboxElement.idl | 2 +- .../xul/nsIDOMXULContainerElement.idl | 4 +-- .../xul/nsIDOMXULControlElement.idl | 2 +- .../xul/nsIDOMXULDescriptionElement.idl | 2 +- dom/interfaces/xul/nsIDOMXULDocument.idl | 2 +- dom/interfaces/xul/nsIDOMXULElement.idl | 2 +- dom/interfaces/xul/nsIDOMXULImageElement.idl | 2 +- dom/interfaces/xul/nsIDOMXULLabelElement.idl | 2 +- .../xul/nsIDOMXULLabeledControlEl.idl | 2 +- .../xul/nsIDOMXULMenuListElement.idl | 2 +- .../xul/nsIDOMXULMultSelectCntrlEl.idl | 2 +- dom/interfaces/xul/nsIDOMXULPopupElement.idl | 2 +- dom/interfaces/xul/nsIDOMXULSelectCntrlEl.idl | 2 +- .../xul/nsIDOMXULSelectCntrlItemEl.idl | 2 +- .../xul/nsIDOMXULTextboxElement.idl | 2 +- dom/interfaces/xul/nsIDOMXULTreeElement.idl | 2 +- .../mochitest/dom-level1-core/exclusions.js | 22 +++++++++++- dom/webidl/Element.webidl | 4 ++- dom/webidl/Node.webidl | 3 -- editor/libeditor/html/nsHTMLURIRefObject.cpp | 2 +- .../src/nsWebBrowserPersist.cpp | 21 +++++++----- layout/inspector/src/inDOMView.cpp | 22 ++++++------ 109 files changed, 173 insertions(+), 165 deletions(-) diff --git a/content/base/public/Element.h b/content/base/public/Element.h index 48f603bc18bd..d0f35b81ece8 100644 --- a/content/base/public/Element.h +++ b/content/base/public/Element.h @@ -419,8 +419,6 @@ public: return SetAttr(aNameSpaceID, aName, nullptr, aValue, aNotify); } - NS_IMETHOD GetAttributes(nsIDOMMozNamedAttrMap** aAttributes); - /** * Helper for SetAttr/SetParsedAttr. This method will return true if aNotify * is true or there are mutation listeners that must be triggered, the @@ -1320,6 +1318,11 @@ NS_IMETHOD GetClassList(nsISupports** aClassList) MOZ_FINAL \ Element::GetClassList(aClassList); \ return NS_OK; \ } \ +NS_IMETHOD GetAttributes(nsIDOMMozNamedAttrMap** aAttributes) MOZ_FINAL \ +{ \ + NS_ADDREF(*aAttributes = Attributes()); \ + return NS_OK; \ +} \ using Element::GetAttribute; \ NS_IMETHOD GetAttribute(const nsAString& name, nsAString& _retval) MOZ_FINAL \ { \ diff --git a/content/base/public/nsINode.h b/content/base/public/nsINode.h index d168c1702cd5..93bdf5e6c5cf 100644 --- a/content/base/public/nsINode.h +++ b/content/base/public/nsINode.h @@ -34,7 +34,6 @@ class nsDOMAttributeMap; class nsIContent; class nsIDocument; class nsIDOMElement; -class nsIDOMMozNamedAttrMap; class nsIDOMNodeList; class nsIDOMUserDataHandler; class nsIEditor; @@ -1653,7 +1652,6 @@ protected: nsresult GetOwnerDocument(nsIDOMDocument** aOwnerDocument); nsresult CompareDocumentPosition(nsIDOMNode* aOther, uint16_t* aReturn); - nsresult GetAttributes(nsIDOMMozNamedAttrMap** aAttributes); nsresult ReplaceOrInsertBefore(bool aReplace, nsIDOMNode *aNewChild, nsIDOMNode *aRefChild, nsIDOMNode **aReturn); @@ -1955,10 +1953,6 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsINode, NS_INODE_IID) { \ return nsINode::GetNextSibling(aNextSibling); \ } \ - NS_IMETHOD GetAttributes(nsIDOMMozNamedAttrMap** aAttributes) __VA_ARGS__ \ - { \ - return nsINode::GetAttributes(aAttributes); \ - } \ NS_IMETHOD GetOwnerDocument(nsIDOMDocument** aOwnerDocument) __VA_ARGS__ \ { \ return nsINode::GetOwnerDocument(aOwnerDocument); \ diff --git a/content/base/src/Element.cpp b/content/base/src/Element.cpp index 3ab729a64ceb..cfba06e5276f 100644 --- a/content/base/src/Element.cpp +++ b/content/base/src/Element.cpp @@ -1468,13 +1468,6 @@ Element::GetExistingAttrNameFromQName(const nsAString& aStr) const return nodeInfo; } -NS_IMETHODIMP -Element::GetAttributes(nsIDOMMozNamedAttrMap** aAttributes) -{ - NS_ADDREF(*aAttributes = Attributes()); - return NS_OK; -} - // static bool Element::ShouldBlur(nsIContent *aContent) diff --git a/content/base/src/nsINode.cpp b/content/base/src/nsINode.cpp index b8ead9005eb8..50948070ad50 100644 --- a/content/base/src/nsINode.cpp +++ b/content/base/src/nsINode.cpp @@ -2404,14 +2404,6 @@ nsINode::GetAttributes() return AsElement()->Attributes(); } -nsresult -nsINode::GetAttributes(nsIDOMMozNamedAttrMap** aAttributes) -{ - nsRefPtr map = GetAttributes(); - map.forget(aAttributes); - return NS_OK; -} - bool EventTarget::DispatchEvent(nsDOMEvent& aEvent, ErrorResult& aRv) diff --git a/dom/imptests/failures/webapps/DOMCore/tests/approved/test_interfaces.html.json b/dom/imptests/failures/webapps/DOMCore/tests/approved/test_interfaces.html.json index f43193681a12..ea778201df4b 100644 --- a/dom/imptests/failures/webapps/DOMCore/tests/approved/test_interfaces.html.json +++ b/dom/imptests/failures/webapps/DOMCore/tests/approved/test_interfaces.html.json @@ -60,7 +60,6 @@ "Element interface: attribute namespaceURI": true, "Element interface: attribute prefix": true, "Element interface: attribute localName": true, - "Element interface: attribute attributes": true, "Element interface: attribute className": true, "Element interface: operation remove()": true, "Element interface: element must inherit property \"className\" with the proper type (5)": true, diff --git a/dom/interfaces/core/nsIDOMAttr.idl b/dom/interfaces/core/nsIDOMAttr.idl index a7eedc90e40b..b5f789b6a27e 100644 --- a/dom/interfaces/core/nsIDOMAttr.idl +++ b/dom/interfaces/core/nsIDOMAttr.idl @@ -14,7 +14,7 @@ * http://www.w3.org/TR/DOM-Level-2-Core/ */ -[scriptable, builtinclass, uuid(d8db04e0-cbee-4063-9c16-8b0693146519)] +[scriptable, builtinclass, uuid(a974a4d3-2ff1-445b-8b8e-0aada5d4eedc)] interface nsIDOMAttr : nsIDOMNode { readonly attribute DOMString name; diff --git a/dom/interfaces/core/nsIDOMCDATASection.idl b/dom/interfaces/core/nsIDOMCDATASection.idl index b27ea7f3a602..929cf357002c 100644 --- a/dom/interfaces/core/nsIDOMCDATASection.idl +++ b/dom/interfaces/core/nsIDOMCDATASection.idl @@ -15,7 +15,7 @@ * http://www.w3.org/TR/DOM-Level-2-Core/ */ -[scriptable, uuid(6e2f1af8-cc86-4ed5-948a-007bb40c65da)] +[scriptable, uuid(cfad94e0-92d6-4b32-ab18-c61f9b8cb313)] interface nsIDOMCDATASection : nsIDOMText { }; diff --git a/dom/interfaces/core/nsIDOMCharacterData.idl b/dom/interfaces/core/nsIDOMCharacterData.idl index ba0b7d964c0c..474c77b17573 100644 --- a/dom/interfaces/core/nsIDOMCharacterData.idl +++ b/dom/interfaces/core/nsIDOMCharacterData.idl @@ -13,7 +13,7 @@ * http://www.w3.org/TR/DOM-Level-2-Core/ */ -[scriptable, uuid(f891fa15-2652-4a88-9be5-364b9192b209)] +[scriptable, uuid(05c29ae6-5533-42b6-9085-257f60445d5a)] interface nsIDOMCharacterData : nsIDOMNode { attribute DOMString data; diff --git a/dom/interfaces/core/nsIDOMComment.idl b/dom/interfaces/core/nsIDOMComment.idl index 9a73d931190e..f01cd84c22a9 100644 --- a/dom/interfaces/core/nsIDOMComment.idl +++ b/dom/interfaces/core/nsIDOMComment.idl @@ -14,7 +14,7 @@ * http://www.w3.org/TR/DOM-Level-2-Core/ */ -[scriptable, uuid(02f2c4cc-47c6-4e5e-9934-da93373b9e47)] +[scriptable, uuid(cf5493dc-ba25-423a-81e7-b417494f103a)] interface nsIDOMComment : nsIDOMCharacterData { }; diff --git a/dom/interfaces/core/nsIDOMDocument.idl b/dom/interfaces/core/nsIDOMDocument.idl index cda4c5e39417..7536b0056629 100644 --- a/dom/interfaces/core/nsIDOMDocument.idl +++ b/dom/interfaces/core/nsIDOMDocument.idl @@ -27,7 +27,7 @@ interface nsIDOMLocation; * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html */ -[scriptable, uuid(23fdb479-2543-4885-9d7a-47dd646966a5)] +[scriptable, uuid(75996de6-6b0f-43e5-ae79-c98fa669da9a)] interface nsIDOMDocument : nsIDOMNode { readonly attribute nsIDOMDocumentType doctype; diff --git a/dom/interfaces/core/nsIDOMDocumentFragment.idl b/dom/interfaces/core/nsIDOMDocumentFragment.idl index 98aab1a89e49..87e9a998fec1 100644 --- a/dom/interfaces/core/nsIDOMDocumentFragment.idl +++ b/dom/interfaces/core/nsIDOMDocumentFragment.idl @@ -14,7 +14,7 @@ * http://www.w3.org/TR/DOM-Level-2-Core/ */ -[scriptable, builtinclass, uuid(b098fc8f-9ef4-4de8-bbd0-4a0fc712dd6e)] +[scriptable, builtinclass, uuid(33127aed-9d6a-4b0d-95aa-0529f51bcb9c)] interface nsIDOMDocumentFragment : nsIDOMNode { }; diff --git a/dom/interfaces/core/nsIDOMDocumentType.idl b/dom/interfaces/core/nsIDOMDocumentType.idl index 356d8a303ace..970e45bf28fb 100644 --- a/dom/interfaces/core/nsIDOMDocumentType.idl +++ b/dom/interfaces/core/nsIDOMDocumentType.idl @@ -15,7 +15,7 @@ * http://www.w3.org/TR/DOM-Level-2-Core/ */ -[scriptable, uuid(2ce127d8-5aaf-440e-b572-bfb7ba81062b)] +[scriptable, uuid(7568365e-240f-4818-b2fc-0680bfb50942)] interface nsIDOMDocumentType : nsIDOMNode { readonly attribute DOMString name; diff --git a/dom/interfaces/core/nsIDOMElement.idl b/dom/interfaces/core/nsIDOMElement.idl index e6b37c709af8..fd091932e041 100644 --- a/dom/interfaces/core/nsIDOMElement.idl +++ b/dom/interfaces/core/nsIDOMElement.idl @@ -5,6 +5,8 @@ #include "nsIDOMNode.idl" +interface nsIDOMMozNamedAttrMap; + /** * The nsIDOMElement interface represents an element in an HTML or * XML document. @@ -13,7 +15,7 @@ * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#interface-element */ -[scriptable, uuid(9387fd9b-46e9-4a1e-997f-713c0123c7f8)] +[scriptable, uuid(ccc2bbbc-5b44-4b01-b718-dd51f339fef8)] interface nsIDOMElement : nsIDOMNode { readonly attribute DOMString tagName; @@ -23,6 +25,7 @@ interface nsIDOMElement : nsIDOMNode */ readonly attribute nsISupports classList; + readonly attribute nsIDOMMozNamedAttrMap attributes; DOMString getAttribute(in DOMString name); DOMString getAttributeNS(in DOMString namespaceURI, in DOMString localName); diff --git a/dom/interfaces/core/nsIDOMNode.idl b/dom/interfaces/core/nsIDOMNode.idl index 2819878d4e8d..e5e96e20b979 100644 --- a/dom/interfaces/core/nsIDOMNode.idl +++ b/dom/interfaces/core/nsIDOMNode.idl @@ -6,7 +6,6 @@ #include "domstubs.idl" interface nsIVariant; -interface nsIDOMMozNamedAttrMap; interface nsIDOMUserDataHandler; /** @@ -18,7 +17,7 @@ interface nsIDOMUserDataHandler; * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html */ -[scriptable, uuid(a8cae9dc-bd35-4a99-a8e9-4170f8a38566)] +[scriptable, uuid(56545150-a001-484e-9ed4-cb319eebd7b3)] interface nsIDOMNode : nsISupports { const unsigned short ELEMENT_NODE = 1; @@ -46,7 +45,6 @@ interface nsIDOMNode : nsISupports readonly attribute nsIDOMNode lastChild; readonly attribute nsIDOMNode previousSibling; readonly attribute nsIDOMNode nextSibling; - readonly attribute nsIDOMMozNamedAttrMap attributes; // Modified in DOM Level 2: readonly attribute nsIDOMDocument ownerDocument; nsIDOMNode insertBefore(in nsIDOMNode newChild, diff --git a/dom/interfaces/core/nsIDOMProcessingInstruction.idl b/dom/interfaces/core/nsIDOMProcessingInstruction.idl index 84a77ee64d8d..42cd95675a04 100644 --- a/dom/interfaces/core/nsIDOMProcessingInstruction.idl +++ b/dom/interfaces/core/nsIDOMProcessingInstruction.idl @@ -15,7 +15,7 @@ * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html */ -[scriptable, uuid(bc6d94d8-cf2c-4a37-aae7-491fc9a62608)] +[scriptable, uuid(9ee8b1c3-2b0d-49e2-b2d6-f6bb8bf21b9e)] interface nsIDOMProcessingInstruction : nsIDOMCharacterData { readonly attribute DOMString target; diff --git a/dom/interfaces/core/nsIDOMText.idl b/dom/interfaces/core/nsIDOMText.idl index f355b9c23027..6703ae927748 100644 --- a/dom/interfaces/core/nsIDOMText.idl +++ b/dom/interfaces/core/nsIDOMText.idl @@ -13,7 +13,7 @@ * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html */ -[scriptable, uuid(d3c734f2-47e9-4eac-84f9-3592022aac13)] +[scriptable, uuid(3de88cc9-1462-4bb8-a2fc-845b132547ac)] interface nsIDOMText : nsIDOMCharacterData { nsIDOMText splitText(in unsigned long offset) diff --git a/dom/interfaces/core/nsIDOMXMLDocument.idl b/dom/interfaces/core/nsIDOMXMLDocument.idl index e25ee317a38d..d00b773ccc5c 100644 --- a/dom/interfaces/core/nsIDOMXMLDocument.idl +++ b/dom/interfaces/core/nsIDOMXMLDocument.idl @@ -5,7 +5,7 @@ #include "nsIDOMDocument.idl" -[scriptable, uuid(7f7abfbb-263f-4a4a-9944-397f0b64bad8)] +[scriptable, uuid(79547ba5-291e-4775-b71e-2440a4621b54)] interface nsIDOMXMLDocument : nsIDOMDocument { // DOM Level 3 Load & Save, DocumentLS diff --git a/dom/interfaces/html/nsIDOMHTMLAnchorElement.idl b/dom/interfaces/html/nsIDOMHTMLAnchorElement.idl index 1435b7c2e53a..15dd33a17f52 100644 --- a/dom/interfaces/html/nsIDOMHTMLAnchorElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLAnchorElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(5651dd01-40f3-43af-9901-759472830133)] +[scriptable, uuid(c75e7bb1-cc7a-4169-9467-9513a95e3b94)] interface nsIDOMHTMLAnchorElement : nsIDOMHTMLElement { attribute DOMString href; diff --git a/dom/interfaces/html/nsIDOMHTMLAppletElement.idl b/dom/interfaces/html/nsIDOMHTMLAppletElement.idl index f6f49aeae7e1..45e03d530874 100644 --- a/dom/interfaces/html/nsIDOMHTMLAppletElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLAppletElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(387a4315-cb8c-4235-a1ec-636a3613ba0d)] +[scriptable, uuid(351dd451-0077-4298-b569-a41529baca32)] interface nsIDOMHTMLAppletElement : nsIDOMHTMLElement { attribute DOMString align; diff --git a/dom/interfaces/html/nsIDOMHTMLAreaElement.idl b/dom/interfaces/html/nsIDOMHTMLAreaElement.idl index 82864b9d9411..05eac25a7f85 100644 --- a/dom/interfaces/html/nsIDOMHTMLAreaElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLAreaElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(968c0f2e-bb68-4420-8350-b4e8f4476ea4)] +[scriptable, uuid(6ab5b382-c19d-4a4e-98b7-2f4e14dbecdf)] interface nsIDOMHTMLAreaElement : nsIDOMHTMLElement { attribute DOMString alt; diff --git a/dom/interfaces/html/nsIDOMHTMLAudioElement.idl b/dom/interfaces/html/nsIDOMHTMLAudioElement.idl index b3b53cb2bc04..4c057f22573a 100644 --- a/dom/interfaces/html/nsIDOMHTMLAudioElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLAudioElement.idl @@ -20,7 +20,7 @@ * @status UNDER_DEVELOPMENT */ -[scriptable, uuid(4f9b3309-a287-4049-962a-f1a4bf05735b)] +[scriptable, uuid(8e3fb6a1-490d-4772-90fd-3e3763958b74)] interface nsIDOMHTMLAudioElement : nsIDOMHTMLMediaElement { // Setup the audio stream for writing diff --git a/dom/interfaces/html/nsIDOMHTMLBRElement.idl b/dom/interfaces/html/nsIDOMHTMLBRElement.idl index 6e549fe1c7df..2c9437114093 100644 --- a/dom/interfaces/html/nsIDOMHTMLBRElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLBRElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(d9385fd2-b334-4aa4-a91c-94fba60a35e9)] +[scriptable, uuid(8e69e7c2-2c32-4176-aec7-3ec9b518f4d7)] interface nsIDOMHTMLBRElement : nsIDOMHTMLElement { attribute DOMString clear; diff --git a/dom/interfaces/html/nsIDOMHTMLBaseElement.idl b/dom/interfaces/html/nsIDOMHTMLBaseElement.idl index f4bfd429ea3a..3c0e415d6563 100644 --- a/dom/interfaces/html/nsIDOMHTMLBaseElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLBaseElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(e770dc6d-86bb-480a-93c6-7ca30b285843)] +[scriptable, uuid(a07d89f2-c923-4632-901c-47b61c2b5f72)] interface nsIDOMHTMLBaseElement : nsIDOMHTMLElement { attribute DOMString href; diff --git a/dom/interfaces/html/nsIDOMHTMLBodyElement.idl b/dom/interfaces/html/nsIDOMHTMLBodyElement.idl index c6b9852a7153..7d07a2f6e887 100644 --- a/dom/interfaces/html/nsIDOMHTMLBodyElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLBodyElement.idl @@ -20,7 +20,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(688267fb-1c86-472e-84de-4aa9a8e72600)] +[scriptable, uuid(4df676f2-7da1-4b88-843c-67d6c3f151df)] interface nsIDOMHTMLBodyElement : nsIDOMHTMLElement { attribute DOMString aLink; diff --git a/dom/interfaces/html/nsIDOMHTMLButtonElement.idl b/dom/interfaces/html/nsIDOMHTMLButtonElement.idl index 02bbf718a5a0..a970694b3478 100644 --- a/dom/interfaces/html/nsIDOMHTMLButtonElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLButtonElement.idl @@ -18,7 +18,7 @@ interface nsIDOMValidityState; -[scriptable, uuid(f8473007-a162-416f-b684-ca715ad0f1ed)] +[scriptable, uuid(1b5905c5-cc98-4446-9700-a90b96e4e2f4)] interface nsIDOMHTMLButtonElement : nsIDOMHTMLElement { attribute boolean autofocus; diff --git a/dom/interfaces/html/nsIDOMHTMLCanvasElement.idl b/dom/interfaces/html/nsIDOMHTMLCanvasElement.idl index 11f7f38af2b1..8b487a427806 100644 --- a/dom/interfaces/html/nsIDOMHTMLCanvasElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLCanvasElement.idl @@ -46,7 +46,7 @@ interface nsIFileCallback : nsISupports { void receive(in nsIDOMBlob file); }; -[scriptable, uuid(41bf4dfb-5563-4987-976d-d809083191e3)] +[scriptable, uuid(1cfacc53-ab73-4ceb-9f5f-22387dcd1aae)] interface nsIDOMHTMLCanvasElement : nsIDOMHTMLElement { attribute unsigned long width; diff --git a/dom/interfaces/html/nsIDOMHTMLCommandElement.idl b/dom/interfaces/html/nsIDOMHTMLCommandElement.idl index dcc60d1897f1..a5fe75e9843d 100644 --- a/dom/interfaces/html/nsIDOMHTMLCommandElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLCommandElement.idl @@ -15,7 +15,7 @@ * @status UNDER_DEVELOPMENT */ -[scriptable, uuid(a25c3a86-3bc0-4b18-a355-7d0a55cf6fb0)] +[scriptable, uuid(97efa08f-8b7f-41bd-8be6-b806eb48b08c)] interface nsIDOMHTMLCommandElement : nsIDOMHTMLElement { attribute DOMString type; diff --git a/dom/interfaces/html/nsIDOMHTMLDListElement.idl b/dom/interfaces/html/nsIDOMHTMLDListElement.idl index a3387d27c73d..a27e01f43bda 100644 --- a/dom/interfaces/html/nsIDOMHTMLDListElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLDListElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(ff6e9c16-3404-4c0b-9d7e-4e3b0bb54637)] +[scriptable, uuid(e611c0c1-d5ea-4d25-b9e5-08d4cafd0151)] interface nsIDOMHTMLDListElement : nsIDOMHTMLElement { attribute boolean compact; diff --git a/dom/interfaces/html/nsIDOMHTMLDataListElement.idl b/dom/interfaces/html/nsIDOMHTMLDataListElement.idl index 3817b392bde5..5888132a6500 100644 --- a/dom/interfaces/html/nsIDOMHTMLDataListElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLDataListElement.idl @@ -17,7 +17,7 @@ interface nsIDOMHTMLCollection; -[scriptable, uuid(b6da7948-b636-4469-b7ca-29f4f86a5051)] +[scriptable, uuid(87ea361b-fe0f-486b-a891-7686dadd6372)] interface nsIDOMHTMLDataListElement : nsIDOMHTMLElement { readonly attribute nsIDOMHTMLCollection options; diff --git a/dom/interfaces/html/nsIDOMHTMLDirectoryElement.idl b/dom/interfaces/html/nsIDOMHTMLDirectoryElement.idl index 85a74cb7f7d2..ff9563587b00 100644 --- a/dom/interfaces/html/nsIDOMHTMLDirectoryElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLDirectoryElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(713df6e7-d46f-4b46-9175-6866d78b6fe5)] +[scriptable, uuid(15b161c4-f471-4681-9368-1114f5d7a129)] interface nsIDOMHTMLDirectoryElement : nsIDOMHTMLElement { attribute boolean compact; diff --git a/dom/interfaces/html/nsIDOMHTMLDivElement.idl b/dom/interfaces/html/nsIDOMHTMLDivElement.idl index 40357e372489..cb6f07b7784d 100644 --- a/dom/interfaces/html/nsIDOMHTMLDivElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLDivElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(ce1579e2-27ff-4a88-b1c9-d85b48970cdd)] +[scriptable, uuid(a4f021dd-9e3b-4a78-a9a0-bae60f9a4cc4)] interface nsIDOMHTMLDivElement : nsIDOMHTMLElement { attribute DOMString align; diff --git a/dom/interfaces/html/nsIDOMHTMLDocument.idl b/dom/interfaces/html/nsIDOMHTMLDocument.idl index 25ff04a69546..0c9a1b220127 100644 --- a/dom/interfaces/html/nsIDOMHTMLDocument.idl +++ b/dom/interfaces/html/nsIDOMHTMLDocument.idl @@ -13,7 +13,7 @@ */ interface nsISelection; -[scriptable, uuid(4aece326-3974-47fe-b60e-ae2decc90e3b)] +[scriptable, uuid(fd76e045-8d97-4a97-ad75-eac5ae2f3ea4)] interface nsIDOMHTMLDocument : nsIDOMDocument { attribute DOMString domain; diff --git a/dom/interfaces/html/nsIDOMHTMLElement.idl b/dom/interfaces/html/nsIDOMHTMLElement.idl index 8cc7af97c7d2..9075689c30bb 100644 --- a/dom/interfaces/html/nsIDOMHTMLElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLElement.idl @@ -19,7 +19,7 @@ interface nsIDOMHTMLMenuElement; * with changes from the work-in-progress WHATWG HTML specification: * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(bad97163-d25a-4dd8-9ca6-86af23df58b5)] +[scriptable, uuid(56d50046-31af-4cdc-af51-217fb2fd0a4d)] interface nsIDOMHTMLElement : nsIDOMElement { // metadata attributes diff --git a/dom/interfaces/html/nsIDOMHTMLEmbedElement.idl b/dom/interfaces/html/nsIDOMHTMLEmbedElement.idl index e7cf0e750d82..f1b458988131 100644 --- a/dom/interfaces/html/nsIDOMHTMLEmbedElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLEmbedElement.idl @@ -13,7 +13,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/#the-embed-element */ -[scriptable, uuid(ee0496f5-fbbe-40f6-b9fd-eafb39fa0c81)] +[scriptable, uuid(ca0de9c2-e230-4acb-aa6d-65fc0283bf06)] interface nsIDOMHTMLEmbedElement : nsIDOMHTMLElement { attribute DOMString align; diff --git a/dom/interfaces/html/nsIDOMHTMLFieldSetElement.idl b/dom/interfaces/html/nsIDOMHTMLFieldSetElement.idl index 79126db7e3c0..7399fc5980e5 100644 --- a/dom/interfaces/html/nsIDOMHTMLFieldSetElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLFieldSetElement.idl @@ -18,7 +18,7 @@ interface nsIDOMValidityState; -[scriptable, uuid(b8da6d2b-e60f-4f05-b8ac-53fbec2a4a99)] +[scriptable, uuid(a3e19d5b-aa7c-46bd-8bca-7135b250260a)] interface nsIDOMHTMLFieldSetElement : nsIDOMHTMLElement { attribute boolean disabled; diff --git a/dom/interfaces/html/nsIDOMHTMLFontElement.idl b/dom/interfaces/html/nsIDOMHTMLFontElement.idl index 565de876e463..267d50c97844 100644 --- a/dom/interfaces/html/nsIDOMHTMLFontElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLFontElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(5962cc25-edac-4370-9653-a6aea30f1202)] +[scriptable, uuid(3ab61e70-7aac-4d9b-99fd-1c5ec5228463)] interface nsIDOMHTMLFontElement : nsIDOMHTMLElement { attribute DOMString color; diff --git a/dom/interfaces/html/nsIDOMHTMLFormElement.idl b/dom/interfaces/html/nsIDOMHTMLFormElement.idl index b9e08f840fab..5373a42dc11a 100644 --- a/dom/interfaces/html/nsIDOMHTMLFormElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLFormElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(aefc1e79-e2e6-4702-9baf-b9545be412f1)] +[scriptable, uuid(6c79f4b0-3d55-45ca-8bf3-68a236e90e97)] interface nsIDOMHTMLFormElement : nsIDOMHTMLElement { attribute DOMString acceptCharset; diff --git a/dom/interfaces/html/nsIDOMHTMLFrameElement.idl b/dom/interfaces/html/nsIDOMHTMLFrameElement.idl index 9b190dc8f34b..554a8683ed52 100644 --- a/dom/interfaces/html/nsIDOMHTMLFrameElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLFrameElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(ff778643-8b2d-4f60-9243-cd8ddc9622f4)] +[scriptable, uuid(912423ad-00c2-4948-8f8e-4950169e516d)] interface nsIDOMHTMLFrameElement : nsIDOMHTMLElement { attribute DOMString frameBorder; diff --git a/dom/interfaces/html/nsIDOMHTMLFrameSetElement.idl b/dom/interfaces/html/nsIDOMHTMLFrameSetElement.idl index 603fde2df5b9..ebdc58ce0157 100644 --- a/dom/interfaces/html/nsIDOMHTMLFrameSetElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLFrameSetElement.idl @@ -20,7 +20,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(6373db9d-ba4f-401a-9d27-8f3242e74304)] +[scriptable, uuid(e62b41c0-eaec-49bc-bf0c-be3a50b175d1)] interface nsIDOMHTMLFrameSetElement : nsIDOMHTMLElement { attribute DOMString cols; diff --git a/dom/interfaces/html/nsIDOMHTMLHRElement.idl b/dom/interfaces/html/nsIDOMHTMLHRElement.idl index aa71ab0c3635..5c7c7f0f9e91 100644 --- a/dom/interfaces/html/nsIDOMHTMLHRElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLHRElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(5170450c-9ab4-4d35-85b0-1d526fa6b9c3)] +[scriptable, uuid(adf811c1-eece-4cd2-9632-ea39bc0e20e7)] interface nsIDOMHTMLHRElement : nsIDOMHTMLElement { attribute DOMString align; diff --git a/dom/interfaces/html/nsIDOMHTMLHeadElement.idl b/dom/interfaces/html/nsIDOMHTMLHeadElement.idl index a57057a9a011..d9e71f82b90b 100644 --- a/dom/interfaces/html/nsIDOMHTMLHeadElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLHeadElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(f7f01f83-9a52-42df-8fae-bad29bca738f)] +[scriptable, uuid(2baa2206-1ce6-4208-aead-d1f6b18e97fb)] interface nsIDOMHTMLHeadElement : nsIDOMHTMLElement { }; diff --git a/dom/interfaces/html/nsIDOMHTMLHeadingElement.idl b/dom/interfaces/html/nsIDOMHTMLHeadingElement.idl index 0f9b8a9b7628..be0c272987e8 100644 --- a/dom/interfaces/html/nsIDOMHTMLHeadingElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLHeadingElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(5ef1d877-8c66-482b-adda-422413d70172)] +[scriptable, uuid(39a59521-2e03-436b-b87b-6405396e1a24)] interface nsIDOMHTMLHeadingElement : nsIDOMHTMLElement { attribute DOMString align; diff --git a/dom/interfaces/html/nsIDOMHTMLHtmlElement.idl b/dom/interfaces/html/nsIDOMHTMLHtmlElement.idl index 74789497f07d..79cc088b5d8a 100644 --- a/dom/interfaces/html/nsIDOMHTMLHtmlElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLHtmlElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(e312ae2d-0a59-4f0e-b078-62c733cfb128)] +[scriptable, uuid(e7720912-1fb4-4c00-ae78-faddba690b45)] interface nsIDOMHTMLHtmlElement : nsIDOMHTMLElement { attribute DOMString version; diff --git a/dom/interfaces/html/nsIDOMHTMLIFrameElement.idl b/dom/interfaces/html/nsIDOMHTMLIFrameElement.idl index db0cf2ce27f0..7d8a879fa400 100644 --- a/dom/interfaces/html/nsIDOMHTMLIFrameElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLIFrameElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(621a850e-f02d-43df-ad23-bce1a5e5df82)] +[scriptable, uuid(87d6e8db-4ae2-4a9d-a546-510836611038)] interface nsIDOMHTMLIFrameElement : nsIDOMHTMLElement { attribute DOMString align; diff --git a/dom/interfaces/html/nsIDOMHTMLImageElement.idl b/dom/interfaces/html/nsIDOMHTMLImageElement.idl index 3b2f3317a677..528564b4f995 100644 --- a/dom/interfaces/html/nsIDOMHTMLImageElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLImageElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(c609e2a7-558b-47a3-b6cd-b5b5e1269d34)] +[scriptable, uuid(0e2ffdcb-b881-436b-a450-4790f47b60fe)] interface nsIDOMHTMLImageElement : nsIDOMHTMLElement { attribute DOMString alt; diff --git a/dom/interfaces/html/nsIDOMHTMLInputElement.idl b/dom/interfaces/html/nsIDOMHTMLInputElement.idl index 67020e903ee4..f040320e560f 100644 --- a/dom/interfaces/html/nsIDOMHTMLInputElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLInputElement.idl @@ -20,7 +20,7 @@ interface nsIDOMValidityState; * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(2a382800-8c28-11e2-9e96-0800200c9a66)] +[scriptable, uuid(3f51d301-be0e-4e19-b056-ea98c03eedfd)] interface nsIDOMHTMLInputElement : nsIDOMHTMLElement { attribute DOMString accept; diff --git a/dom/interfaces/html/nsIDOMHTMLLIElement.idl b/dom/interfaces/html/nsIDOMHTMLLIElement.idl index 5a190635ed79..96a778a13706 100644 --- a/dom/interfaces/html/nsIDOMHTMLLIElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLLIElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(b16df68d-6ac0-4f8e-a261-e92b66336b4d)] +[scriptable, uuid(8be7060b-66fe-47f4-99f0-44fe65cf9cd6)] interface nsIDOMHTMLLIElement : nsIDOMHTMLElement { attribute DOMString type; diff --git a/dom/interfaces/html/nsIDOMHTMLLabelElement.idl b/dom/interfaces/html/nsIDOMHTMLLabelElement.idl index f6da94c29aab..58e0caa24632 100644 --- a/dom/interfaces/html/nsIDOMHTMLLabelElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLLabelElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(87d29556-4ef9-4776-88aa-0172ca502620)] +[scriptable, uuid(02024255-6b9e-445f-971e-ac71ed091a64)] interface nsIDOMHTMLLabelElement : nsIDOMHTMLElement { readonly attribute nsIDOMHTMLFormElement form; diff --git a/dom/interfaces/html/nsIDOMHTMLLegendElement.idl b/dom/interfaces/html/nsIDOMHTMLLegendElement.idl index e8bac4ab88c9..6b87b0dbed8b 100644 --- a/dom/interfaces/html/nsIDOMHTMLLegendElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLLegendElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(5d032e27-0f83-434f-ad36-7879b61664a5)] +[scriptable, uuid(42f1c264-d2b1-4f50-95cf-929ae2ea4c52)] interface nsIDOMHTMLLegendElement : nsIDOMHTMLElement { readonly attribute nsIDOMHTMLFormElement form; diff --git a/dom/interfaces/html/nsIDOMHTMLLinkElement.idl b/dom/interfaces/html/nsIDOMHTMLLinkElement.idl index 970ccf9ec443..f89e0f8d7698 100644 --- a/dom/interfaces/html/nsIDOMHTMLLinkElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLLinkElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(3c798909-b3a6-4cc3-a659-8752979d4034)] +[scriptable, uuid(ca856a0b-6786-4123-90fe-dc9c7600274e)] interface nsIDOMHTMLLinkElement : nsIDOMHTMLElement { attribute boolean disabled; diff --git a/dom/interfaces/html/nsIDOMHTMLMapElement.idl b/dom/interfaces/html/nsIDOMHTMLMapElement.idl index 89efdd026a42..36fae8324eae 100644 --- a/dom/interfaces/html/nsIDOMHTMLMapElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLMapElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(fbe59a8a-bd0e-45b7-b1e0-fe5aba223eb3)] +[scriptable, uuid(4b2136a3-f296-479a-88dc-ed4421eb3a22)] interface nsIDOMHTMLMapElement : nsIDOMHTMLElement { readonly attribute nsIDOMHTMLCollection areas; diff --git a/dom/interfaces/html/nsIDOMHTMLMediaElement.idl b/dom/interfaces/html/nsIDOMHTMLMediaElement.idl index 19a815f21ed3..7962b9b9aa68 100644 --- a/dom/interfaces/html/nsIDOMHTMLMediaElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLMediaElement.idl @@ -27,7 +27,7 @@ interface nsIDOMMediaStream; #endif %} -[scriptable, uuid(076770ab-988c-49a2-b3f0-90542f4a8c32)] +[scriptable, uuid(585a5edd-0a64-4edb-a7d7-d0304e3b8e55)] interface nsIDOMHTMLMediaElement : nsIDOMHTMLElement { // error state diff --git a/dom/interfaces/html/nsIDOMHTMLMenuElement.idl b/dom/interfaces/html/nsIDOMHTMLMenuElement.idl index ed78ad57afd5..9c87865562f0 100644 --- a/dom/interfaces/html/nsIDOMHTMLMenuElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLMenuElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(b51d30c7-b483-4821-96d9-bac26466afe3)] +[scriptable, uuid(6790c2f5-01ac-43ba-9145-dd2052e3b0c7)] interface nsIDOMHTMLMenuElement : nsIDOMHTMLElement { attribute boolean compact; diff --git a/dom/interfaces/html/nsIDOMHTMLMenuItemElement.idl b/dom/interfaces/html/nsIDOMHTMLMenuItemElement.idl index 452be8ce3e59..8804431b1cd4 100644 --- a/dom/interfaces/html/nsIDOMHTMLMenuItemElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLMenuItemElement.idl @@ -12,7 +12,7 @@ * @status UNDER_DEVELOPMENT */ -[scriptable, uuid(faf61262-140e-4171-a809-bae8e767bb82)] +[scriptable, uuid(79a4ca67-bca8-4044-bc69-629e8961137a)] interface nsIDOMHTMLMenuItemElement : nsIDOMHTMLCommandElement { }; diff --git a/dom/interfaces/html/nsIDOMHTMLMetaElement.idl b/dom/interfaces/html/nsIDOMHTMLMetaElement.idl index d6058ae802f7..7c678b45c0ab 100644 --- a/dom/interfaces/html/nsIDOMHTMLMetaElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLMetaElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(bee8b4e4-2fb8-4e05-86ff-b4bb57e4e997)] +[scriptable, uuid(1aeebf8a-577e-433a-ae40-339426b52e96)] interface nsIDOMHTMLMetaElement : nsIDOMHTMLElement { attribute DOMString content; diff --git a/dom/interfaces/html/nsIDOMHTMLMeterElement.idl b/dom/interfaces/html/nsIDOMHTMLMeterElement.idl index eb7969fa08da..75cedb6ddfd0 100644 --- a/dom/interfaces/html/nsIDOMHTMLMeterElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLMeterElement.idl @@ -13,7 +13,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/multipage/the-button-element.html#the-meter-element */ -[scriptable, uuid(dadff222-3298-4083-804a-f7a8c33c97a8)] +[scriptable, uuid(53b55f04-fd1a-47e5-8181-d059114a3bc9)] interface nsIDOMHTMLMeterElement : nsIDOMHTMLElement { attribute double value; diff --git a/dom/interfaces/html/nsIDOMHTMLModElement.idl b/dom/interfaces/html/nsIDOMHTMLModElement.idl index d14e8633f247..f2545978022e 100644 --- a/dom/interfaces/html/nsIDOMHTMLModElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLModElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(6a3ceacd-e1a5-466d-8dea-7746dbf4efa3)] +[scriptable, uuid(c8ce2f75-2bbf-4c30-8627-0ea1a7b2ebf7)] interface nsIDOMHTMLModElement : nsIDOMHTMLElement { attribute DOMString cite; diff --git a/dom/interfaces/html/nsIDOMHTMLOListElement.idl b/dom/interfaces/html/nsIDOMHTMLOListElement.idl index 4fc98db8a5be..e03767fd3d78 100644 --- a/dom/interfaces/html/nsIDOMHTMLOListElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLOListElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(ad55969a-47c7-4ef6-bf1d-9c058a0cfcd6)] +[scriptable, uuid(d94ba4eb-a154-4abf-9868-105905e995e4)] interface nsIDOMHTMLOListElement : nsIDOMHTMLElement { attribute boolean compact; diff --git a/dom/interfaces/html/nsIDOMHTMLObjectElement.idl b/dom/interfaces/html/nsIDOMHTMLObjectElement.idl index eff9ab67abf8..f8336b398dc7 100644 --- a/dom/interfaces/html/nsIDOMHTMLObjectElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLObjectElement.idl @@ -18,7 +18,7 @@ interface nsIDOMValidityState; -[scriptable, uuid(bf05cb92-234e-4626-bf48-89a9033fe6cc)] +[scriptable, uuid(2481afa7-9ca3-448b-80d7-0138c47b5b33)] interface nsIDOMHTMLObjectElement : nsIDOMHTMLElement { readonly attribute nsIDOMHTMLFormElement form; diff --git a/dom/interfaces/html/nsIDOMHTMLOptGroupElement.idl b/dom/interfaces/html/nsIDOMHTMLOptGroupElement.idl index eda614cab26a..b62aa5ecebcb 100644 --- a/dom/interfaces/html/nsIDOMHTMLOptGroupElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLOptGroupElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(ffd64130-e942-4407-b7fd-e12e261c2f4a)] +[scriptable, uuid(cc9fe8ad-908b-40c4-b007-254e15d783bb)] interface nsIDOMHTMLOptGroupElement : nsIDOMHTMLElement { attribute boolean disabled; diff --git a/dom/interfaces/html/nsIDOMHTMLOptionElement.idl b/dom/interfaces/html/nsIDOMHTMLOptionElement.idl index e238ee5f7764..8a1a04d1eb34 100644 --- a/dom/interfaces/html/nsIDOMHTMLOptionElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLOptionElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(ab79abf1-78c2-40dc-88a9-ea8dea025055)] +[scriptable, uuid(d4c53417-e746-451a-8b8a-0fa3fcda95b3)] interface nsIDOMHTMLOptionElement : nsIDOMHTMLElement { attribute boolean disabled; diff --git a/dom/interfaces/html/nsIDOMHTMLOutputElement.idl b/dom/interfaces/html/nsIDOMHTMLOutputElement.idl index 7bd3de322329..6a3bff5e1008 100644 --- a/dom/interfaces/html/nsIDOMHTMLOutputElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLOutputElement.idl @@ -17,7 +17,7 @@ interface nsIDOMValidityState; -[scriptable, uuid(433f8f1d-437e-443a-a0ae-80b1a2f8021a)] +[scriptable, uuid(6d6bf653-3eb4-420f-b1b0-6ad919a06926)] interface nsIDOMHTMLOutputElement : nsIDOMHTMLElement { // DOMSettableTokenList diff --git a/dom/interfaces/html/nsIDOMHTMLParagraphElement.idl b/dom/interfaces/html/nsIDOMHTMLParagraphElement.idl index 498a7b5e654a..fc2fb712a0ba 100644 --- a/dom/interfaces/html/nsIDOMHTMLParagraphElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLParagraphElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(2fa5df08-f0dc-4946-b257-4081a5a534c6)] +[scriptable, uuid(ccc50b61-8e2e-4e0a-be5e-0b30923051b0)] interface nsIDOMHTMLParagraphElement : nsIDOMHTMLElement { attribute DOMString align; diff --git a/dom/interfaces/html/nsIDOMHTMLParamElement.idl b/dom/interfaces/html/nsIDOMHTMLParamElement.idl index 5ed0398ed97c..0866ccd4c2a6 100644 --- a/dom/interfaces/html/nsIDOMHTMLParamElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLParamElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(4763cd82-7aeb-4e9a-9867-9751860d65f0)] +[scriptable, uuid(9cb0d681-1d1c-4c5d-b165-579cafcdf897)] interface nsIDOMHTMLParamElement : nsIDOMHTMLElement { attribute DOMString name; diff --git a/dom/interfaces/html/nsIDOMHTMLPreElement.idl b/dom/interfaces/html/nsIDOMHTMLPreElement.idl index 363277036c28..2432eed2c1be 100644 --- a/dom/interfaces/html/nsIDOMHTMLPreElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLPreElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(820daae5-9859-4d02-95cb-be3714eded04)] +[scriptable, uuid(128840c4-0973-4c7a-b71a-81e23071f1f6)] interface nsIDOMHTMLPreElement : nsIDOMHTMLElement { attribute long width; diff --git a/dom/interfaces/html/nsIDOMHTMLProgressElement.idl b/dom/interfaces/html/nsIDOMHTMLProgressElement.idl index 72e990f225d6..922ccaad760e 100644 --- a/dom/interfaces/html/nsIDOMHTMLProgressElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLProgressElement.idl @@ -15,7 +15,7 @@ * @status UNDER_DEVELOPMENT */ -[scriptable, uuid(63428690-29b2-4c8f-8d76-61cbb532fbbd)] +[scriptable, uuid(e5ba151c-0772-4849-8021-fb30f341fff9)] interface nsIDOMHTMLProgressElement : nsIDOMHTMLElement { attribute double value; diff --git a/dom/interfaces/html/nsIDOMHTMLQuoteElement.idl b/dom/interfaces/html/nsIDOMHTMLQuoteElement.idl index 33f63aca31de..2c8f73a3f919 100644 --- a/dom/interfaces/html/nsIDOMHTMLQuoteElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLQuoteElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(ae6ced8c-2a95-4faa-9b64-39be3c065d80)] +[scriptable, uuid(fa9731da-fa8a-48a4-95a3-cba2623bcc59)] interface nsIDOMHTMLQuoteElement : nsIDOMHTMLElement { attribute DOMString cite; diff --git a/dom/interfaces/html/nsIDOMHTMLScriptElement.idl b/dom/interfaces/html/nsIDOMHTMLScriptElement.idl index 31b4cdb88460..687bb5748c64 100644 --- a/dom/interfaces/html/nsIDOMHTMLScriptElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLScriptElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(e4f546c8-f382-49ff-9199-b98555ac3160)] +[scriptable, uuid(e445db32-0116-4cf5-b73e-7073ccf3d259)] interface nsIDOMHTMLScriptElement : nsIDOMHTMLElement { attribute DOMString src; diff --git a/dom/interfaces/html/nsIDOMHTMLSelectElement.idl b/dom/interfaces/html/nsIDOMHTMLSelectElement.idl index e406d3b91e4d..6f6e2a92cc23 100644 --- a/dom/interfaces/html/nsIDOMHTMLSelectElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLSelectElement.idl @@ -19,7 +19,7 @@ interface nsIDOMValidityState; -[scriptable, uuid(03aed73d-98f2-4790-a3ef-3df92ba7d200)] +[scriptable, uuid(d959feb0-a7e8-44d6-9346-b48253ad8ba4)] interface nsIDOMHTMLSelectElement : nsIDOMHTMLElement { attribute boolean autofocus; diff --git a/dom/interfaces/html/nsIDOMHTMLSourceElement.idl b/dom/interfaces/html/nsIDOMHTMLSourceElement.idl index dd29c059f527..ca0ed8d8a3b5 100644 --- a/dom/interfaces/html/nsIDOMHTMLSourceElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLSourceElement.idl @@ -16,7 +16,7 @@ * @status UNDER_DEVELOPMENT */ -[scriptable, uuid(27e300bd-34cc-4ae2-830e-65e6f64b94c4)] +[scriptable, uuid(333faeb7-93dc-439e-a50e-a9df705b8ba6)] interface nsIDOMHTMLSourceElement : nsIDOMHTMLElement { attribute DOMString src; diff --git a/dom/interfaces/html/nsIDOMHTMLStyleElement.idl b/dom/interfaces/html/nsIDOMHTMLStyleElement.idl index 0a47aabb206a..ed6e600df173 100644 --- a/dom/interfaces/html/nsIDOMHTMLStyleElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLStyleElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(8c39826a-1e1e-43c1-aadc-52cbb98b869d)] +[scriptable, uuid(5e6c9cac-5594-4006-ae3f-ad82fb28cee9)] interface nsIDOMHTMLStyleElement : nsIDOMHTMLElement { attribute boolean disabled; diff --git a/dom/interfaces/html/nsIDOMHTMLTableCaptionElem.idl b/dom/interfaces/html/nsIDOMHTMLTableCaptionElem.idl index 7dbd572ade7c..19b0217eeb2f 100644 --- a/dom/interfaces/html/nsIDOMHTMLTableCaptionElem.idl +++ b/dom/interfaces/html/nsIDOMHTMLTableCaptionElem.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, builtinclass, uuid(cf39761e-2940-4414-b251-52cf58a3549d)] +[scriptable, builtinclass, uuid(310ebe52-7377-4fc4-9546-a6f4dcaafa1f)] interface nsIDOMHTMLTableCaptionElement : nsIDOMHTMLElement { attribute DOMString align; diff --git a/dom/interfaces/html/nsIDOMHTMLTableCellElement.idl b/dom/interfaces/html/nsIDOMHTMLTableCellElement.idl index cc63b231c761..ff9c2f9a374a 100644 --- a/dom/interfaces/html/nsIDOMHTMLTableCellElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLTableCellElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(a7528219-8330-41b9-be84-035d93a9a838)] +[scriptable, uuid(2c008303-f082-434b-b47e-4c8dea659ea0)] interface nsIDOMHTMLTableCellElement : nsIDOMHTMLElement { readonly attribute long cellIndex; diff --git a/dom/interfaces/html/nsIDOMHTMLTableColElement.idl b/dom/interfaces/html/nsIDOMHTMLTableColElement.idl index 7487b7f15147..9e97cefca1db 100644 --- a/dom/interfaces/html/nsIDOMHTMLTableColElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLTableColElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(03218327-7835-4f2a-8005-2f2a44a53de6)] +[scriptable, uuid(f38fe6c8-9dfd-4c24-aeab-352459383d67)] interface nsIDOMHTMLTableColElement : nsIDOMHTMLElement { attribute DOMString align; diff --git a/dom/interfaces/html/nsIDOMHTMLTableElement.idl b/dom/interfaces/html/nsIDOMHTMLTableElement.idl index f4c263b86d6c..d7dc8ce1b629 100644 --- a/dom/interfaces/html/nsIDOMHTMLTableElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLTableElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(00c45041-0071-438d-a38f-5cd050fc7209)] +[scriptable, uuid(cee6898b-621f-4e94-b9d1-53e7f42dbd3a)] interface nsIDOMHTMLTableElement : nsIDOMHTMLElement { // Modified in DOM Level 2: diff --git a/dom/interfaces/html/nsIDOMHTMLTableRowElement.idl b/dom/interfaces/html/nsIDOMHTMLTableRowElement.idl index d0d124a9d5e5..8fe67c964a06 100644 --- a/dom/interfaces/html/nsIDOMHTMLTableRowElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLTableRowElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(3e1dfeb2-f3d5-4f53-aba9-eccd66708434)] +[scriptable, uuid(ccbaf4d5-1c2d-4edb-9faf-094e357da044)] interface nsIDOMHTMLTableRowElement : nsIDOMHTMLElement { // Modified in DOM Level 2: diff --git a/dom/interfaces/html/nsIDOMHTMLTableSectionElement.idl b/dom/interfaces/html/nsIDOMHTMLTableSectionElement.idl index 81a586b74040..aabdfc7892c6 100644 --- a/dom/interfaces/html/nsIDOMHTMLTableSectionElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLTableSectionElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, builtinclass, uuid(ad993b34-9cb6-4505-91ab-7596b525b57d)] +[scriptable, builtinclass, uuid(233c3242-5379-4977-81c5-58bf90743a09)] interface nsIDOMHTMLTableSectionElement : nsIDOMHTMLElement { attribute DOMString align; diff --git a/dom/interfaces/html/nsIDOMHTMLTextAreaElement.idl b/dom/interfaces/html/nsIDOMHTMLTextAreaElement.idl index 8303f0e3239b..3a0def1f7340 100644 --- a/dom/interfaces/html/nsIDOMHTMLTextAreaElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLTextAreaElement.idl @@ -19,7 +19,7 @@ interface nsIDOMValidityState; * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(20f6166a-7808-4a66-ab3e-67689850fd06)] +[scriptable, uuid(c888f597-b77e-4ba6-b7bc-09cfc7d58f4a)] interface nsIDOMHTMLTextAreaElement : nsIDOMHTMLElement { attribute boolean autofocus; diff --git a/dom/interfaces/html/nsIDOMHTMLTitleElement.idl b/dom/interfaces/html/nsIDOMHTMLTitleElement.idl index 6dd9bbc328e9..84aea94ace4b 100644 --- a/dom/interfaces/html/nsIDOMHTMLTitleElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLTitleElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(3e68b80a-7e85-42b5-bf36-682e3540ae1c)] +[scriptable, uuid(5da56fa3-1a87-4931-8411-3f6be1a43178)] interface nsIDOMHTMLTitleElement : nsIDOMHTMLElement { attribute DOMString text; diff --git a/dom/interfaces/html/nsIDOMHTMLUListElement.idl b/dom/interfaces/html/nsIDOMHTMLUListElement.idl index 0d8b24e4cd3c..70abe41f31e2 100644 --- a/dom/interfaces/html/nsIDOMHTMLUListElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLUListElement.idl @@ -16,7 +16,7 @@ * http://www.whatwg.org/specs/web-apps/current-work/ */ -[scriptable, uuid(a5770ec3-b27a-4c54-acb1-ddbe1564878b)] +[scriptable, uuid(edb972d4-82b0-4be6-9145-caeb5d99a4ae)] interface nsIDOMHTMLUListElement : nsIDOMHTMLElement { attribute boolean compact; diff --git a/dom/interfaces/html/nsIDOMHTMLUnknownElement.idl b/dom/interfaces/html/nsIDOMHTMLUnknownElement.idl index 25f3c464107b..ed413b39973d 100644 --- a/dom/interfaces/html/nsIDOMHTMLUnknownElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLUnknownElement.idl @@ -11,7 +11,7 @@ * * @see */ -[scriptable, uuid(788cd4a4-31dc-4fc4-b43e-3e36fb86a2b1)] +[scriptable, uuid(3f4be98b-c6e5-41b4-bc0d-f659f7d109e0)] interface nsIDOMHTMLUnknownElement : nsIDOMHTMLElement { }; diff --git a/dom/interfaces/html/nsIDOMHTMLVideoElement.idl b/dom/interfaces/html/nsIDOMHTMLVideoElement.idl index 02745c4b5d97..c02c7124cf6c 100644 --- a/dom/interfaces/html/nsIDOMHTMLVideoElement.idl +++ b/dom/interfaces/html/nsIDOMHTMLVideoElement.idl @@ -16,7 +16,7 @@ * @status UNDER_DEVELOPMENT */ -[scriptable, uuid(7124a1a6-229b-4bac-9245-b59c12678544)] +[scriptable, uuid(4582aec0-8627-4a45-9aa4-22ec64ae9309)] interface nsIDOMHTMLVideoElement : nsIDOMHTMLMediaElement { attribute long width; diff --git a/dom/interfaces/svg/nsIDOMSVGDocument.idl b/dom/interfaces/svg/nsIDOMSVGDocument.idl index 7f8a9d9ce7cd..26edcb527787 100644 --- a/dom/interfaces/svg/nsIDOMSVGDocument.idl +++ b/dom/interfaces/svg/nsIDOMSVGDocument.idl @@ -7,7 +7,7 @@ interface nsIDOMSVGElement; -[scriptable, uuid(743de308-c894-42e9-8cf3-55c10894a4a1)] +[scriptable, uuid(72d201c7-159c-4b64-886f-ed3920dd9462)] interface nsIDOMSVGDocument : nsIDOMDocument { readonly attribute DOMString domain; diff --git a/dom/interfaces/svg/nsIDOMSVGElement.idl b/dom/interfaces/svg/nsIDOMSVGElement.idl index 6e6e8bb0ff1e..d8a4dbd7aa2b 100644 --- a/dom/interfaces/svg/nsIDOMSVGElement.idl +++ b/dom/interfaces/svg/nsIDOMSVGElement.idl @@ -10,7 +10,7 @@ interface nsIDOMCSSStyleDeclaration; interface nsIDOMCSSValue; -[scriptable, uuid(d0d6d9a6-85f7-44ff-b0a1-608eddbb4216)] +[scriptable, uuid(b0d2bcfa-9aac-4c23-9a8b-b88f7c4b93a5)] interface nsIDOMSVGElement : nsIDOMElement { attribute DOMString id; diff --git a/dom/interfaces/svg/nsIDOMSVGFilters.idl b/dom/interfaces/svg/nsIDOMSVGFilters.idl index d01729895f58..6da0e3865f0a 100644 --- a/dom/interfaces/svg/nsIDOMSVGFilters.idl +++ b/dom/interfaces/svg/nsIDOMSVGFilters.idl @@ -11,7 +11,7 @@ interface nsIDOMSVGAnimatedNumber; interface nsIDOMSVGAnimatedEnumeration; interface nsIDOMSVGAnimatedInteger; -[scriptable, uuid(69fdc425-6033-4e64-b042-6f90f2b4cbb2)] +[scriptable, uuid(4db427db-bbe2-4c22-875e-ed62c93cd759)] interface nsIDOMSVGFilterPrimitiveStandardAttributes : nsIDOMSVGElement { readonly attribute nsIDOMSVGAnimatedLength x; @@ -21,7 +21,7 @@ interface nsIDOMSVGFilterPrimitiveStandardAttributes : nsIDOMSVGElement readonly attribute nsIDOMSVGAnimatedString result; }; -[scriptable, uuid(a2e8e14a-51a8-40c1-add5-dcf5dbfdfe16)] +[scriptable, uuid(a73ab3fb-05fa-4153-95e7-b2194b90e57c)] interface nsIDOMSVGFEColorMatrixElement : nsIDOMSVGFilterPrimitiveStandardAttributes { // Color Matrix Types @@ -37,7 +37,7 @@ interface nsIDOMSVGFEColorMatrixElement : nsIDOMSVGFilterPrimitiveStandardAttrib readonly attribute nsISupports values; }; -[scriptable, uuid(87e1d0d5-6ee4-4287-a268-cb87e75ed092)] +[scriptable, uuid(3fa8c369-df5b-4bfb-9651-c999bc22fbc7)] interface nsIDOMSVGComponentTransferFunctionElement : nsIDOMSVGElement { // Component Transfer Types @@ -58,7 +58,7 @@ interface nsIDOMSVGComponentTransferFunctionElement : nsIDOMSVGElement readonly attribute nsIDOMSVGAnimatedNumber offset; }; -[scriptable, uuid(e4a5f4af-4a37-416f-b072-f8ea8a4ceedb)] +[scriptable, uuid(f264fd1f-b272-4796-99b5-68c90cbd030c)] interface nsIDOMSVGFECompositeElement : nsIDOMSVGFilterPrimitiveStandardAttributes { // Operator Types @@ -82,27 +82,27 @@ interface nsIDOMSVGFECompositeElement : nsIDOMSVGFilterPrimitiveStandardAttribut }; -[scriptable, uuid(4398f6a6-580f-432e-a61d-f7982911e459)] +[scriptable, uuid(7ff6cba9-65e0-48d2-9d81-4ab26782a945)] interface nsIDOMSVGFEFuncRElement : nsIDOMSVGComponentTransferFunctionElement { }; -[scriptable, uuid(0d0fb545-a21c-4d99-b9b2-3ba15fe3ddec)] +[scriptable, uuid(b6a7ad39-724f-42ab-8d3f-a05d1cf7ab0c)] interface nsIDOMSVGFEFuncGElement : nsIDOMSVGComponentTransferFunctionElement { }; -[scriptable, uuid(06e77981-867f-48d4-8bf7-e768684999af)] +[scriptable, uuid(c414b7dd-7ff2-4158-988a-20943d22db52)] interface nsIDOMSVGFEFuncBElement : nsIDOMSVGComponentTransferFunctionElement { }; -[scriptable, uuid(464b0bdf-de53-460a-a33e-a966454aa757)] +[scriptable, uuid(f4f5fe63-9570-48f7-ba7e-a5300fa71aed)] interface nsIDOMSVGFEFuncAElement : nsIDOMSVGComponentTransferFunctionElement { }; -[scriptable, uuid(4f218457-08f8-43a3-a5ba-ed4a5490d1a5)] +[scriptable, uuid(08f2d7e5-b79f-405c-8140-7faa72c53ead)] interface nsIDOMSVGFEGaussianBlurElement : nsIDOMSVGFilterPrimitiveStandardAttributes { readonly attribute nsIDOMSVGAnimatedString in1; @@ -112,14 +112,14 @@ interface nsIDOMSVGFEGaussianBlurElement : nsIDOMSVGFilterPrimitiveStandardAttri void setStdDeviation ( in float stdDeviationX, in float stdDeviationY ); }; -[scriptable, uuid(aebe14bf-c98d-4d29-afc5-a1f27813d78d)] +[scriptable, uuid(4fa9fbbe-482c-418a-afd1-d51b003f5a04)] interface nsIDOMSVGFEOffsetElement : nsIDOMSVGFilterPrimitiveStandardAttributes { readonly attribute nsIDOMSVGAnimatedString in1; readonly attribute nsIDOMSVGAnimatedNumber dx; readonly attribute nsIDOMSVGAnimatedNumber dy; }; -[scriptable, uuid(d60f68fc-179f-430d-ab0d-ff868db7d548)] +[scriptable, uuid(b0f8b61c-7825-4149-a295-c85604ec50fa)] interface nsIDOMSVGFETurbulenceElement : nsIDOMSVGFilterPrimitiveStandardAttributes { // Turbulence Types @@ -139,7 +139,7 @@ interface nsIDOMSVGFETurbulenceElement : nsIDOMSVGFilterPrimitiveStandardAttribu readonly attribute nsIDOMSVGAnimatedEnumeration type; }; -[scriptable, uuid(4a68a914-caa3-4c52-9d6c-46264f338244)] +[scriptable, uuid(655154fa-ad26-45b5-81b1-988986707ee4)] interface nsIDOMSVGFEMorphologyElement : nsIDOMSVGFilterPrimitiveStandardAttributes { // Operator Types @@ -155,7 +155,7 @@ interface nsIDOMSVGFEMorphologyElement : nsIDOMSVGFilterPrimitiveStandardAttribu void setRadius ( in float rx, in float ry ); }; -[scriptable, uuid(d3f7688a-a813-4f40-9419-b8a4d99449bb)] +[scriptable, uuid(658c2d9c-01aa-4896-a35a-c42147fcf004)] interface nsIDOMSVGFEConvolveMatrixElement : nsIDOMSVGFilterPrimitiveStandardAttributes { // Edge Mode Values @@ -179,7 +179,7 @@ interface nsIDOMSVGFEConvolveMatrixElement : nsIDOMSVGFilterPrimitiveStandardAtt readonly attribute nsISupports preserveAlpha; }; -[scriptable, uuid(9fed3a1f-b3b0-4056-9d79-45bbea7008af)] +[scriptable, uuid(44b5d9f8-87ec-46e7-9d55-115edbeebdd6)] interface nsIDOMSVGFEDiffuseLightingElement : nsIDOMSVGFilterPrimitiveStandardAttributes { readonly attribute nsIDOMSVGAnimatedString in1; @@ -189,7 +189,7 @@ interface nsIDOMSVGFEDiffuseLightingElement : nsIDOMSVGFilterPrimitiveStandardA readonly attribute nsIDOMSVGAnimatedNumber kernelUnitLengthY; }; -[scriptable, uuid(387c810f-8711-4763-867c-7da1e12e34a0)] +[scriptable, uuid(2426a9ec-d891-47a8-bab6-d32b10fc5e81)] interface nsIDOMSVGFESpecularLightingElement : nsIDOMSVGFilterPrimitiveStandardAttributes { readonly attribute nsIDOMSVGAnimatedString in1; @@ -200,7 +200,7 @@ interface nsIDOMSVGFESpecularLightingElement : nsIDOMSVGFilterPrimitiveStandardA readonly attribute nsIDOMSVGAnimatedNumber kernelUnitLengthY; }; -[scriptable, uuid(e9bd8308-dc52-438b-a315-a0d545dfeda3)] +[scriptable, uuid(91cc30ef-4b48-4a11-8d29-13f8ffe28821)] interface nsIDOMSVGFESpotLightElement : nsIDOMSVGElement { readonly attribute nsIDOMSVGAnimatedNumber x; readonly attribute nsIDOMSVGAnimatedNumber y; @@ -212,7 +212,7 @@ interface nsIDOMSVGFESpotLightElement : nsIDOMSVGElement { readonly attribute nsIDOMSVGAnimatedNumber limitingConeAngle; }; -[scriptable, uuid(a68509dc-d3aa-4c9c-989e-36cf07c1294a)] +[scriptable, uuid(64bd5e60-5961-4db5-a7ab-718354491fcb)] interface nsIDOMSVGFEDisplacementMapElement : nsIDOMSVGFilterPrimitiveStandardAttributes { // Channel Selectors diff --git a/dom/interfaces/xpath/nsIDOMXPathNamespace.idl b/dom/interfaces/xpath/nsIDOMXPathNamespace.idl index 83125e2019e4..b0fc3164c9ab 100644 --- a/dom/interfaces/xpath/nsIDOMXPathNamespace.idl +++ b/dom/interfaces/xpath/nsIDOMXPathNamespace.idl @@ -9,7 +9,7 @@ #include "nsIDOMNode.idl" -[scriptable, uuid(04b34387-ea27-4a39-9ebc-de2aec9cec01)] +[scriptable, uuid(558c2ab9-513e-43c2-afea-4930024b15b3)] interface nsIDOMXPathNamespace : nsIDOMNode { // XPathNodeType diff --git a/dom/interfaces/xul/nsIDOMXULButtonElement.idl b/dom/interfaces/xul/nsIDOMXULButtonElement.idl index 33aafa0111b8..fc25f406018a 100644 --- a/dom/interfaces/xul/nsIDOMXULButtonElement.idl +++ b/dom/interfaces/xul/nsIDOMXULButtonElement.idl @@ -5,7 +5,7 @@ #include "nsIDOMXULLabeledControlEl.idl" -[scriptable, uuid(f632980b-9f73-4510-8d22-2dca4b4b1152)] +[scriptable, uuid(8eec22e8-91f4-44fc-9142-b4cd0f623076)] interface nsIDOMXULButtonElement : nsIDOMXULLabeledControlElement { const short CHECKSTATE_UNCHECKED = 0; const short CHECKSTATE_CHECKED = 1; diff --git a/dom/interfaces/xul/nsIDOMXULCheckboxElement.idl b/dom/interfaces/xul/nsIDOMXULCheckboxElement.idl index cf8c06cae71f..a71fc0ab4082 100644 --- a/dom/interfaces/xul/nsIDOMXULCheckboxElement.idl +++ b/dom/interfaces/xul/nsIDOMXULCheckboxElement.idl @@ -6,7 +6,7 @@ #include "nsIDOMElement.idl" #include "nsIDOMXULLabeledControlEl.idl" -[scriptable, uuid(3ed88db7-8da4-4b76-be4c-cdba4167552f)] +[scriptable, uuid(b0539219-67c8-47c1-934c-08040701b33b)] interface nsIDOMXULCheckboxElement : nsIDOMXULLabeledControlElement { const short CHECKSTATE_UNCHECKED = 0; const short CHECKSTATE_CHECKED = 1; diff --git a/dom/interfaces/xul/nsIDOMXULContainerElement.idl b/dom/interfaces/xul/nsIDOMXULContainerElement.idl index bb5c319cfa88..7284b8ee9dc6 100644 --- a/dom/interfaces/xul/nsIDOMXULContainerElement.idl +++ b/dom/interfaces/xul/nsIDOMXULContainerElement.idl @@ -6,7 +6,7 @@ #include "nsIDOMXULElement.idl" interface nsIDOMXULContainerElement; -[scriptable, uuid(1711387a-a43c-4d41-887a-0fb7fe5de421)] +[scriptable, uuid(0cedc92f-a0ab-4c4c-83e9-582607b8d7e2)] interface nsIDOMXULContainerItemElement : nsIDOMXULElement { /** @@ -15,7 +15,7 @@ interface nsIDOMXULContainerItemElement : nsIDOMXULElement readonly attribute nsIDOMXULContainerElement parentContainer; }; -[scriptable, uuid(1d8ba880-a4b3-4a01-b541-4628ca16ef63)] +[scriptable, uuid(c0b1bfdd-6199-412d-af79-8d6524865a5b)] interface nsIDOMXULContainerElement : nsIDOMXULContainerItemElement { /** diff --git a/dom/interfaces/xul/nsIDOMXULControlElement.idl b/dom/interfaces/xul/nsIDOMXULControlElement.idl index 4454edb1dd35..d9472ddca7f7 100644 --- a/dom/interfaces/xul/nsIDOMXULControlElement.idl +++ b/dom/interfaces/xul/nsIDOMXULControlElement.idl @@ -8,7 +8,7 @@ interface nsIControllers; -[scriptable, uuid(fff46371-eac2-4cc2-ab7f-aa407bd4d34c)] +[scriptable, uuid(3b1bce24-c3ad-4568-8e10-85922b521e8b)] interface nsIDOMXULControlElement : nsIDOMXULElement { attribute boolean disabled; attribute long tabIndex; diff --git a/dom/interfaces/xul/nsIDOMXULDescriptionElement.idl b/dom/interfaces/xul/nsIDOMXULDescriptionElement.idl index 0388843691f2..e5b9726e136f 100644 --- a/dom/interfaces/xul/nsIDOMXULDescriptionElement.idl +++ b/dom/interfaces/xul/nsIDOMXULDescriptionElement.idl @@ -6,7 +6,7 @@ #include "nsIDOMXULElement.idl" -[scriptable, uuid(16e926dd-50ad-423c-9f65-0d6640811c71)] +[scriptable, uuid(c5e2a24f-3c35-40c0-baf1-c92ecd09d232)] interface nsIDOMXULDescriptionElement : nsIDOMXULElement { attribute boolean disabled; attribute boolean crop; diff --git a/dom/interfaces/xul/nsIDOMXULDocument.idl b/dom/interfaces/xul/nsIDOMXULDocument.idl index 595b178f1094..5fec28e752a5 100644 --- a/dom/interfaces/xul/nsIDOMXULDocument.idl +++ b/dom/interfaces/xul/nsIDOMXULDocument.idl @@ -10,7 +10,7 @@ interface nsIDOMXULCommandDispatcher; interface nsIObserver; interface nsIBoxObject; -[scriptable, uuid(14b07f48-b00f-447d-826b-f036877e1879)] +[scriptable, uuid(7b188822-f3fc-42f2-93a9-7eee445e0108)] interface nsIDOMXULDocument : nsIDOMDocument { attribute nsIDOMNode popupNode; diff --git a/dom/interfaces/xul/nsIDOMXULElement.idl b/dom/interfaces/xul/nsIDOMXULElement.idl index c7b15996ebe3..93d7609adc1d 100644 --- a/dom/interfaces/xul/nsIDOMXULElement.idl +++ b/dom/interfaces/xul/nsIDOMXULElement.idl @@ -12,7 +12,7 @@ interface nsIControllers; interface nsIBoxObject; -[scriptable, uuid(4190fae4-a678-49b3-88da-5fc5c086cf77)] +[scriptable, uuid(5d9d2e4f-a748-44f0-99d1-406384efdc5c)] interface nsIDOMXULElement : nsIDOMElement { attribute DOMString className; diff --git a/dom/interfaces/xul/nsIDOMXULImageElement.idl b/dom/interfaces/xul/nsIDOMXULImageElement.idl index 88d7e42505e2..6d63c27140fc 100644 --- a/dom/interfaces/xul/nsIDOMXULImageElement.idl +++ b/dom/interfaces/xul/nsIDOMXULImageElement.idl @@ -5,7 +5,7 @@ #include "nsIDOMElement.idl" #include "nsIDOMXULElement.idl" -[scriptable, uuid(92714d1c-5622-4174-90bb-a3df06e00918)] +[scriptable, uuid(d7967c4e-60e1-486d-a730-c25b285f0ffa)] interface nsIDOMXULImageElement : nsIDOMXULElement { attribute DOMString src; }; diff --git a/dom/interfaces/xul/nsIDOMXULLabelElement.idl b/dom/interfaces/xul/nsIDOMXULLabelElement.idl index 65f25df80688..13fb1c28fbe3 100644 --- a/dom/interfaces/xul/nsIDOMXULLabelElement.idl +++ b/dom/interfaces/xul/nsIDOMXULLabelElement.idl @@ -5,7 +5,7 @@ #include "nsIDOMXULDescriptionElement.idl" -[scriptable, uuid(a5b91902-2412-4724-8dff-789dc2a7bcd7)] +[scriptable, uuid(6fe7161c-bab0-4232-9145-76d82480c1b0)] interface nsIDOMXULLabelElement : nsIDOMXULDescriptionElement { attribute DOMString accessKey; attribute DOMString control; diff --git a/dom/interfaces/xul/nsIDOMXULLabeledControlEl.idl b/dom/interfaces/xul/nsIDOMXULLabeledControlEl.idl index af32b8d048d6..f9e4d206c2a1 100644 --- a/dom/interfaces/xul/nsIDOMXULLabeledControlEl.idl +++ b/dom/interfaces/xul/nsIDOMXULLabeledControlEl.idl @@ -6,7 +6,7 @@ #include "nsIDOMElement.idl" #include "nsIDOMXULControlElement.idl" -[scriptable, uuid(8b08fe72-17d7-4ebf-8a08-587056e57cc1)] +[scriptable, uuid(eecd5462-3ead-4caa-9651-0c2b88b39a65)] interface nsIDOMXULLabeledControlElement : nsIDOMXULControlElement { attribute DOMString crop; attribute DOMString image; diff --git a/dom/interfaces/xul/nsIDOMXULMenuListElement.idl b/dom/interfaces/xul/nsIDOMXULMenuListElement.idl index cd181e394391..652fbd4c6e6d 100644 --- a/dom/interfaces/xul/nsIDOMXULMenuListElement.idl +++ b/dom/interfaces/xul/nsIDOMXULMenuListElement.idl @@ -6,7 +6,7 @@ #include "nsIDOMXULSelectCntrlEl.idl" interface nsIDOMXULTextBoxElement; -[scriptable, uuid(85b9d1c1-5dad-402e-923f-5c8676782774)] +[scriptable, uuid(df76f885-717a-484b-81f9-76700a04b51d)] interface nsIDOMXULMenuListElement : nsIDOMXULSelectControlElement { attribute boolean editable; attribute boolean open; diff --git a/dom/interfaces/xul/nsIDOMXULMultSelectCntrlEl.idl b/dom/interfaces/xul/nsIDOMXULMultSelectCntrlEl.idl index 2029969582b6..332658606c8a 100644 --- a/dom/interfaces/xul/nsIDOMXULMultSelectCntrlEl.idl +++ b/dom/interfaces/xul/nsIDOMXULMultSelectCntrlEl.idl @@ -5,7 +5,7 @@ #include "nsIDOMXULSelectCntrlEl.idl" -[scriptable, uuid(99685353-ee11-4e97-9445-b431ca419496)] +[scriptable, uuid(16a38e07-405b-42a3-b45d-c78037757c01)] interface nsIDOMXULMultiSelectControlElement : nsIDOMXULSelectControlElement { attribute DOMString selType; diff --git a/dom/interfaces/xul/nsIDOMXULPopupElement.idl b/dom/interfaces/xul/nsIDOMXULPopupElement.idl index a431e426ddfb..36ca99b1faf1 100644 --- a/dom/interfaces/xul/nsIDOMXULPopupElement.idl +++ b/dom/interfaces/xul/nsIDOMXULPopupElement.idl @@ -6,7 +6,7 @@ #include "nsIDOMElement.idl" #include "nsIDOMXULElement.idl" -[scriptable, uuid(254e7b5a-92ca-4120-a355-ce6adbf841b1)] +[scriptable, uuid(0037e541-09f8-475d-8274-ceff62332e6b)] interface nsIDOMXULPopupElement : nsIDOMXULElement { const unsigned short BEFORE_START = 1; const unsigned short BEFORE_END = 2; diff --git a/dom/interfaces/xul/nsIDOMXULSelectCntrlEl.idl b/dom/interfaces/xul/nsIDOMXULSelectCntrlEl.idl index 51d3b68575a6..d945e0607007 100644 --- a/dom/interfaces/xul/nsIDOMXULSelectCntrlEl.idl +++ b/dom/interfaces/xul/nsIDOMXULSelectCntrlEl.idl @@ -6,7 +6,7 @@ #include "nsIDOMXULControlElement.idl" interface nsIDOMXULSelectControlItemElement; -[scriptable, uuid(97d3e88d-ae76-4789-99c6-0da7d98452b8)] +[scriptable, uuid(f9cbf59c-0cdd-416e-a809-40da4a7a8cb5)] interface nsIDOMXULSelectControlElement : nsIDOMXULControlElement { attribute nsIDOMXULSelectControlItemElement selectedItem; attribute long selectedIndex; diff --git a/dom/interfaces/xul/nsIDOMXULSelectCntrlItemEl.idl b/dom/interfaces/xul/nsIDOMXULSelectCntrlItemEl.idl index 8575dffd77cf..5cd5ac14fede 100644 --- a/dom/interfaces/xul/nsIDOMXULSelectCntrlItemEl.idl +++ b/dom/interfaces/xul/nsIDOMXULSelectCntrlItemEl.idl @@ -6,7 +6,7 @@ #include "nsIDOMXULElement.idl" interface nsIDOMXULSelectControlElement; -[scriptable, uuid(09599681-3526-41f9-a7b6-c408ccb3e1cc)] +[scriptable, uuid(85fa64de-91d9-4b2f-b9fb-28eb718ea436)] interface nsIDOMXULSelectControlItemElement : nsIDOMXULElement { attribute boolean disabled; attribute DOMString crop; diff --git a/dom/interfaces/xul/nsIDOMXULTextboxElement.idl b/dom/interfaces/xul/nsIDOMXULTextboxElement.idl index d5770c8409b4..ec19e9316f7e 100644 --- a/dom/interfaces/xul/nsIDOMXULTextboxElement.idl +++ b/dom/interfaces/xul/nsIDOMXULTextboxElement.idl @@ -6,7 +6,7 @@ #include "nsIDOMXULLabeledControlEl.idl" interface nsIDOMHTMLInputElement; -[scriptable, uuid(372a46ae-7071-47fd-afb8-618624c055aa)] +[scriptable, uuid(5bab7935-6219-45f8-9f7c-54ac8e9b023b)] interface nsIDOMXULTextBoxElement : nsIDOMXULControlElement { // inputField may be any type of editable field, such as an diff --git a/dom/interfaces/xul/nsIDOMXULTreeElement.idl b/dom/interfaces/xul/nsIDOMXULTreeElement.idl index 8be6b33bf47c..c871e04f9f82 100644 --- a/dom/interfaces/xul/nsIDOMXULTreeElement.idl +++ b/dom/interfaces/xul/nsIDOMXULTreeElement.idl @@ -14,7 +14,7 @@ interface nsIDOMXULTextBoxElement; * @status UNDER_DEVELOPMENT */ -[scriptable, uuid(e582a355-803f-4b68-93d0-9396037cc98e)] +[scriptable, uuid(a3c573b8-8fb8-4cde-a47a-dca921eee94c)] interface nsIDOMXULTreeElement : nsIDOMXULElement { diff --git a/dom/tests/mochitest/dom-level1-core/exclusions.js b/dom/tests/mochitest/dom-level1-core/exclusions.js index b06099181c7e..aff4a75af2ed 100644 --- a/dom/tests/mochitest/dom-level1-core/exclusions.js +++ b/dom/tests/mochitest/dom-level1-core/exclusions.js @@ -61,6 +61,26 @@ var createEntityRef = ["documentinvalidcharacterexceptioncreateentref", "hc_attrgetvalue2", "hc_nodevalue03"]; var createProcessingInstructionHTML = ["documentinvalidcharacterexceptioncreatepi", "documentinvalidcharacterexceptioncreatepi1"]; +// These tests expect Node.attributes to exist. +var attributesOnNode = [ + "hc_commentgetcomment", + "hc_documentgetdoctype", + "hc_nodeattributenodeattribute", + "hc_nodecommentnodeattributes", + "hc_nodecommentnodeattributes", + "hc_nodedocumentfragmentnodevalue", + "hc_nodedocumentnodeattribute", + "hc_nodetextnodeattribute", + "nodeattributenodeattribute", + "nodecommentnodeattributes", + "nodecommentnodeattributes", + "nodedocumentfragmentnodevalue", + "nodedocumentnodeattribute", + "nodeprocessinginstructionnodeattributes", + "nodetextnodeattribute", + "nodecdatasectionnodeattribute", + "nodedocumenttypenodevalue" +] var todoTests = {}; function concat(lst/*...*/) { @@ -73,5 +93,5 @@ function concat(lst/*...*/) { } return f; } -var exclusions = concat(dtdTests, indexErrTests, attributeModTests, modTests, createEntityRef, createProcessingInstructionHTML); +var exclusions = concat(dtdTests, indexErrTests, attributeModTests, modTests, createEntityRef, createProcessingInstructionHTML, attributesOnNode); for (var excludedTestName in exclusions) { todoTests[exclusions[excludedTestName]] = true; } diff --git a/dom/webidl/Element.webidl b/dom/webidl/Element.webidl index 85e996c9e71e..f9b6db13fc26 100644 --- a/dom/webidl/Element.webidl +++ b/dom/webidl/Element.webidl @@ -14,6 +14,7 @@ */ interface Attr; +interface MozNamedAttrMap; interface Element : Node { /* @@ -37,7 +38,8 @@ interface Element : Node { [Constant] readonly attribute DOMTokenList? classList; - //readonly attribute Attr[] attributes; + [Constant] + readonly attribute MozNamedAttrMap attributes; DOMString? getAttribute(DOMString name); DOMString? getAttributeNS(DOMString? namespace, DOMString localName); [Throws] diff --git a/dom/webidl/Node.webidl b/dom/webidl/Node.webidl index 42e72059064d..e878eaa1340e 100644 --- a/dom/webidl/Node.webidl +++ b/dom/webidl/Node.webidl @@ -10,7 +10,6 @@ * liability, trademark and document use rules apply. */ -interface MozNamedAttrMap; interface Principal; interface URI; interface UserDataHandler; @@ -87,8 +86,6 @@ interface Node : EventTarget { // Mozilla-specific stuff // These have been moved to Element in the spec. - [Constant] - readonly attribute MozNamedAttrMap? attributes; // If we move namespaceURI, prefix and localName to Element they should return // a non-nullable type. [Constant] diff --git a/editor/libeditor/html/nsHTMLURIRefObject.cpp b/editor/libeditor/html/nsHTMLURIRefObject.cpp index f4e613f13d95..da4ef645647c 100644 --- a/editor/libeditor/html/nsHTMLURIRefObject.cpp +++ b/editor/libeditor/html/nsHTMLURIRefObject.cpp @@ -117,7 +117,7 @@ nsHTMLURIRefObject::GetNextURI(nsAString & aURI) NS_ENSURE_TRUE(element, NS_ERROR_INVALID_ARG); mCurAttrIndex = 0; - mNode->GetAttributes(getter_AddRefs(mAttributes)); + element->GetAttributes(getter_AddRefs(mAttributes)); NS_ENSURE_TRUE(mAttributes, NS_ERROR_NOT_INITIALIZED); rv = mAttributes->GetLength(&mAttributeCnt); diff --git a/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp b/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp index 3f5281b93ecd..271e910b878f 100644 --- a/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp +++ b/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp @@ -3373,13 +3373,14 @@ nsWebBrowserPersist::StoreURIAttributeNS( NS_ENSURE_ARG_POINTER(aNamespaceURI); NS_ENSURE_ARG_POINTER(aAttribute); - nsresult rv = NS_OK; + nsCOMPtr element = do_QueryInterface(aNode); + MOZ_ASSERT(element); // Find the named URI attribute on the (element) node and store // a reference to the URI that maps onto a local file name nsCOMPtr attrMap; - rv = aNode->GetAttributes(getter_AddRefs(attrMap)); + nsresult rv = element->GetAttributes(getter_AddRefs(attrMap)); NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE); NS_ConvertASCIItoUTF16 namespaceURI(aNamespaceURI); @@ -3476,20 +3477,21 @@ nsWebBrowserPersist::FixupURI(nsAString &aURI) nsresult nsWebBrowserPersist::FixupNodeAttributeNS(nsIDOMNode *aNode, - const char *aNamespaceURI, - const char *aAttribute) + const char *aNamespaceURI, + const char *aAttribute) { NS_ENSURE_ARG_POINTER(aNode); NS_ENSURE_ARG_POINTER(aNamespaceURI); NS_ENSURE_ARG_POINTER(aAttribute); - nsresult rv = NS_OK; - // Find the named URI attribute on the (element) node and change it to reference // a local file. + nsCOMPtr element = do_QueryInterface(aNode); + MOZ_ASSERT(element); + nsCOMPtr attrMap; - rv = aNode->GetAttributes(getter_AddRefs(attrMap)); + nsresult rv = element->GetAttributes(getter_AddRefs(attrMap)); NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE); NS_ConvertASCIItoUTF16 attribute(aAttribute); @@ -3514,8 +3516,11 @@ nsWebBrowserPersist::FixupAnchor(nsIDOMNode *aNode) { NS_ENSURE_ARG_POINTER(aNode); + nsCOMPtr element = do_QueryInterface(aNode); + MOZ_ASSERT(element); + nsCOMPtr attrMap; - nsresult rv = aNode->GetAttributes(getter_AddRefs(attrMap)); + nsresult rv = element->GetAttributes(getter_AddRefs(attrMap)); NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE); if (mPersistFlags & PERSIST_FLAGS_DONT_FIXUP_LINKS) diff --git a/layout/inspector/src/inDOMView.cpp b/layout/inspector/src/inDOMView.cpp index b77dd92cdeeb..c092399d3663 100644 --- a/layout/inspector/src/inDOMView.cpp +++ b/layout/inspector/src/inDOMView.cpp @@ -650,7 +650,6 @@ inDOMView::AttributeChanged(nsIDocument* aDocument, dom::Element* aElement, nsCOMPtr kungFuDeathGrip(this); // get the dom attribute node, if there is any - nsCOMPtr content(do_QueryInterface(aElement)); nsCOMPtr el(do_QueryInterface(aElement)); nsCOMPtr domAttr; nsDependentAtomString attrStr(aAttribute); @@ -685,20 +684,20 @@ inDOMView::AttributeChanged(nsIDocument* aDocument, dom::Element* aElement, } // get the number of attributes on this content node nsCOMPtr attrs; - content->GetAttributes(getter_AddRefs(attrs)); + el->GetAttributes(getter_AddRefs(attrs)); uint32_t attrCount; attrs->GetLength(&attrCount); inDOMViewNode* contentNode = nullptr; int32_t contentRow; int32_t attrRow; - if (mRootNode == content && + if (mRootNode == el && !(mWhatToShow & nsIDOMNodeFilter::SHOW_ELEMENT)) { // if this view has a root node but is not displaying it, // it is ok to act as if the changed attribute is on the root. attrRow = attrCount - 1; } else { - if (NS_FAILED(NodeToRow(content, &contentRow))) { + if (NS_FAILED(NodeToRow(el, &contentRow))) { return; } RowToNode(contentRow, &contentNode); @@ -730,11 +729,11 @@ inDOMView::AttributeChanged(nsIDocument* aDocument, dom::Element* aElement, inDOMViewNode* contentNode = nullptr; int32_t contentRow; int32_t baseLevel; - if (NS_SUCCEEDED(NodeToRow(content, &contentRow))) { + if (NS_SUCCEEDED(NodeToRow(el, &contentRow))) { RowToNode(contentRow, &contentNode); baseLevel = contentNode->level; } else { - if (mRootNode == content) { + if (mRootNode == el) { contentRow = -1; baseLevel = -1; } else @@ -1180,10 +1179,13 @@ inDOMView::GetChildNodesFor(nsIDOMNode* aNode, nsCOMArray& aResult) NS_ENSURE_ARG(aNode); // attribute nodes if (mWhatToShow & nsIDOMNodeFilter::SHOW_ATTRIBUTE) { - nsCOMPtr attrs; - aNode->GetAttributes(getter_AddRefs(attrs)); - if (attrs) { - AppendAttrsToArray(attrs, aResult); + nsCOMPtr element = do_QueryInterface(aNode); + if (element) { + nsCOMPtr attrs; + element->GetAttributes(getter_AddRefs(attrs)); + if (attrs) { + AppendAttrsToArray(attrs, aResult); + } } }