wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out 2 changesets (bug 1055773) for debug mochitest-3 bustage

Browse Source 
CLOSED TREE

Backed out changeset 72b7c1efb2b5 (bug 1055773)
Backed out changeset 5850ae46157b (bug 1055773)
This commit is contained in:
Phil Ringnalda 2014-09-16 22:11:31 -07:00
parent d5d3ee2608
commit cc128c4065
22 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
content/base/public/Element.h
View File

@ -646,10 +646,6 @@ public:
}
bool HasAttributeNS(const nsAString& aNamespaceURI,
const nsAString& aLocalName) const;
bool HasAttributes() const
{
return HasAttrs();
}
Element* Closest(const nsAString& aSelector,
ErrorResult& aResult);
bool Matches(const nsAString& aSelector,
@ -1348,6 +1344,11 @@ inline const mozilla::dom::Element* nsINode::AsElement() const
return static_cast<const mozilla::dom::Element*>(this);
}
inline bool nsINode::HasAttributes() const
{
return IsElement() && AsElement()->HasAttrs();
}
/**
* Macros to implement Clone(). _elementName is the class for which to implement
* Clone.
@ -1531,11 +1532,6 @@ NS_IMETHOD HasAttributeNS(const nsAString& namespaceURI, \
*_retval = Element::HasAttributeNS(namespaceURI, localName); \
return NS_OK; \
} \
NS_IMETHOD HasAttributes(bool* _retval) MOZ_FINAL \
{ \
*_retval = Element::HasAttributes(); \
return NS_OK; \
} \
NS_IMETHOD GetAttributeNode(const nsAString& name, \
nsIDOMAttr** _retval) MOZ_FINAL \
{ \

9
content/base/public/nsINode.h
View File

@ -1640,7 +1640,8 @@ public:
localName.Length());
}
}
// HasAttributes is defined inline in Element.h.
bool HasAttributes() const;
nsDOMAttributeMap* GetAttributes();
void SetUserData(JSContext* aCx, const nsAString& aKey,
JS::Handle<JS::Value> aData,
@ -1993,6 +1994,12 @@ ToCanonicalSupports(nsINode* aPointer)
aLocalName = nsINode::LocalName(); \
return NS_OK; \
} \
using nsINode::HasAttributes; \
NS_IMETHOD HasAttributes(bool* aResult) __VA_ARGS__ \
{ \
*aResult = nsINode::HasAttributes(); \
return NS_OK; \
} \
NS_IMETHOD GetDOMBaseURI(nsAString& aBaseURI) __VA_ARGS__ \
{ \
nsINode::GetBaseURI(aBaseURI); \

2
dom/imptests/html/dom/test_historical.html
View File

@ -115,7 +115,7 @@ function isNukedFromNode(name) {
}, "Node member must be nuked: " + name)
}
var nodeNuked = [
//"hasAttributes",
"hasAttributes",
//"attributes",
//"namespaceURI",
//"prefix",

2
dom/interfaces/core/nsIDOMAttr.idl
View File

@ -14,7 +14,7 @@
* http://www.w3.org/TR/DOM-Level-2-Core/
*/
[builtinclass, uuid(d900b239-a98a-4c40-9308-456255177a11)]
[builtinclass, uuid(93bf61ba-9ffa-42b7-9594-2de803c9627c)]
interface nsIDOMAttr : nsIDOMNode
{
readonly attribute DOMString name;

2
dom/interfaces/core/nsIDOMCDATASection.idl
View File

@ -15,7 +15,7 @@
* http://www.w3.org/TR/DOM-Level-2-Core/
*/
[uuid(66c0b3ed-9093-4fb6-9a0e-f50a74ec4be2)]
[uuid(864c4e6a-3933-4f8a-8dd8-3883be60ea10)]
interface nsIDOMCDATASection : nsIDOMText
{
};

2
dom/interfaces/core/nsIDOMCharacterData.idl
View File

@ -13,7 +13,7 @@
* http://www.w3.org/TR/DOM-Level-2-Core/
*/
[uuid(930a1b18-3a9d-4ba8-8d73-1443978ef438)]
[uuid(7b1b8719-6669-4614-bf96-93ddf7966f64)]
interface nsIDOMCharacterData : nsIDOMNode
{
attribute DOMString data;

2
dom/interfaces/core/nsIDOMComment.idl
View File

@ -14,7 +14,7 @@
* http://www.w3.org/TR/DOM-Level-2-Core/
*/
[uuid(d57e5382-6377-48ad-8223-2396d156e18d)]
[uuid(8edde4d9-dc26-492c-8477-2be0f95088ad)]
interface nsIDOMComment : nsIDOMCharacterData
{
};

2
dom/interfaces/core/nsIDOMDocument.idl
View File

@ -32,7 +32,7 @@ interface nsIDOMLocation;
* http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html
*/
[uuid(2053c184-e123-4ed0-81e5-25d09c75f571)]
[uuid(950ca868-e09f-4a7d-9b87-e4ec9aedb3e5)]
interface nsIDOMDocument : nsIDOMNode
{
readonly attribute nsIDOMDocumentType doctype;

2
dom/interfaces/core/nsIDOMDocumentFragment.idl
View File

@ -14,7 +14,7 @@
* http://www.w3.org/TR/DOM-Level-2-Core/
*/
[builtinclass, uuid(fcb2d88d-52d0-4430-a2ce-de7bc26a5560)]
[builtinclass, uuid(5c601878-5b77-4f88-9425-3fe8d2dc8813)]
interface nsIDOMDocumentFragment : nsIDOMNode
{
/**

2
dom/interfaces/core/nsIDOMDocumentType.idl
View File

@ -15,7 +15,7 @@
* http://www.w3.org/TR/DOM-Level-2-Core/
*/
[uuid(0b699482-9624-490c-9b14-b0dd929fed08)]
[uuid(55fe2f3f-35e8-4cb0-b39d-bea1bd0061c7)]
interface nsIDOMDocumentType : nsIDOMNode
{
readonly attribute DOMString name;

3
dom/interfaces/core/nsIDOMElement.idl
View File

@ -15,7 +15,7 @@ interface nsIDOMMozNamedAttrMap;
* http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#interface-element
*/
[uuid(6b72525b-b62b-4468-8f84-bb2a0be3f06d)]
[uuid(ea94c5e2-5d5d-4afe-b3ab-431903797f31)]
interface nsIDOMElement : nsIDOMNode
{
readonly attribute DOMString tagName;
@ -42,7 +42,6 @@ interface nsIDOMElement : nsIDOMNode
boolean hasAttribute(in DOMString name);
boolean hasAttributeNS(in DOMString namespaceURI,
in DOMString localName);
boolean hasAttributes();
// Obsolete methods.
nsIDOMAttr getAttributeNode(in DOMString name);

4
dom/interfaces/core/nsIDOMNode.idl
View File

@ -16,7 +16,7 @@ interface nsIVariant;
* http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html
*/
[uuid(55015e1c-1a3d-4fd9-a1fe-3050e792ca66)]
[uuid(3eef1ab9-2f87-4eda-9bb9-469c37294f72)]
interface nsIDOMNode : nsISupports
{
const unsigned short ELEMENT_NODE = 1;
@ -68,6 +68,8 @@ interface nsIDOMNode : nsISupports
// Introduced in DOM Level 2:
readonly attribute DOMString localName;
// Introduced in DOM Level 2:
boolean hasAttributes();
// Introduced in DOM Level 3:
// This uses a binaryname to avoid warnings due to name collision with

2
dom/interfaces/core/nsIDOMProcessingInstruction.idl
View File

@ -15,7 +15,7 @@
* http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html
*/
[uuid(6d8d2ba8-eeed-462d-a921-a493d85f705c)]
[uuid(ca632936-4c6b-48b4-9920-fbe1e3710802)]
interface nsIDOMProcessingInstruction : nsIDOMCharacterData
{
readonly attribute DOMString target;

2
dom/interfaces/core/nsIDOMText.idl
View File

@ -13,7 +13,7 @@
* http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html
*/
[uuid(fd7749d3-6baa-4107-a05c-dbc4031c9ab4)]
[uuid(b16d449b-60f1-444a-a7e5-dc50a5d0ffad)]
interface nsIDOMText : nsIDOMCharacterData
{
nsIDOMText splitText(in unsigned long offset)

2
dom/interfaces/core/nsIDOMXMLDocument.idl
View File

@ -5,7 +5,7 @@
#include "nsIDOMDocument.idl"
[uuid(a859ef23-33fb-4d63-ad1f-86c8b7131d3a)]
[uuid(dc767223-838f-4ca2-9f4c-ae685862d1df)]
interface nsIDOMXMLDocument : nsIDOMDocument
{
// DOM Level 3 Load & Save, DocumentLS

2
dom/interfaces/html/nsIDOMHTMLDocument.idl
View File

@ -13,7 +13,7 @@
*/
interface nsISelection;
[uuid(b416f90d-c16e-4030-970e-a3bbb04b0056)]
[uuid(b7fcb58a-9ad5-44b5-8c6f-b7181c249413)]
interface nsIDOMHTMLDocument : nsIDOMDocument
{
attribute DOMString domain;

2
dom/interfaces/html/nsIDOMHTMLElement.idl
View File

@ -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/
*/
[uuid(b9015d46-2f81-4e9b-a1c4-42d267c6dc81)]
[uuid(2728c077-9ecc-4a75-ac95-16fbfcb007df)]
interface nsIDOMHTMLElement : nsIDOMElement
{
// metadata attributes

2
dom/interfaces/svg/nsIDOMSVGElement.idl
View File

@ -9,7 +9,7 @@ interface nsIDOMCSSStyleDeclaration;
interface nsIDOMCSSValue;
[uuid(2dc8f099-bef8-48bf-87e6-761ed1111d18)]
[uuid(7a11697a-668b-4a6e-a44a-909abffee230)]
interface nsIDOMSVGElement : nsIDOMElement
{
// raises DOMException on setting

2
dom/interfaces/xul/nsIDOMXULDocument.idl
View File

@ -10,7 +10,7 @@ interface nsIDOMXULCommandDispatcher;
interface nsIObserver;
interface nsIBoxObject;
[uuid(1ac9d95b-435b-4a08-a4d1-9a4d62f5ad0e)]
[uuid(546c658e-805f-4293-9738-6e6a00d75839)]
interface nsIDOMXULDocument : nsIDOMDocument
{
attribute nsIDOMNode popupNode;

2
dom/interfaces/xul/nsIDOMXULElement.idl
View File

@ -12,7 +12,7 @@ interface nsIControllers;
interface nsIBoxObject;
[uuid(dc1cc763-da46-487c-9608-34033ac121c7)]
[uuid(1bd9303d-0854-4ed3-9fda-added29a570e)]
interface nsIDOMXULElement : nsIDOMElement
{
// Layout properties

2
dom/webidl/Element.webidl
View File

@ -51,8 +51,6 @@ interface Element : Node {
boolean hasAttribute(DOMString name);
[Pure]
boolean hasAttributeNS(DOMString? namespace, DOMString localName);
[Pure]
boolean hasAttributes();
[Throws, Pure]
Element? closest(DOMString selector);

2
dom/webidl/Node.webidl
View File

@ -101,6 +101,8 @@ interface Node : EventTarget {
[Constant]
readonly attribute DOMString? localName;
[Pure]
boolean hasAttributes();
[Throws, Func="IsChromeOrXBL"]
any setUserData(DOMString key, any data);
[Throws, Func="IsChromeOrXBL"]