Permalink
Browse files

Merge backout of changeset ca80d75dbcb1 (which was a backout of bug 7…

…34019) in an attempt to fix bug 734019. a=akeybl
  • Loading branch information...
2 parents 458db58 + 99c32a5 commit 7f981436b62d96b579e77c7f90bfa61485ea2296 @bzbarsky bzbarsky committed Apr 17, 2012
Showing with 458 additions and 629 deletions.
  1. +74 −112 content/base/src/nsGenericElement.cpp
  2. +2 −90 content/base/src/nsGenericElement.h
  3. +1 −2 content/html/content/test/test_bug389797.html
  4. +0 −6 dom/base/nsDOMClassInfo.cpp
  5. +0 −1 dom/interfaces/base/domstubs.idl
  6. +0 −1 dom/interfaces/core/Makefile.in
  7. +155 −28 dom/interfaces/core/nsIDOMElement.idl
  8. +0 −179 dom/interfaces/core/nsIDOMNSElement.idl
  9. +1 −1 dom/interfaces/html/nsIDOMHTMLAnchorElement.idl
  10. +1 −1 dom/interfaces/html/nsIDOMHTMLAppletElement.idl
  11. +1 −1 dom/interfaces/html/nsIDOMHTMLAreaElement.idl
  12. +1 −1 dom/interfaces/html/nsIDOMHTMLAudioElement.idl
  13. +1 −1 dom/interfaces/html/nsIDOMHTMLBRElement.idl
  14. +1 −1 dom/interfaces/html/nsIDOMHTMLBaseElement.idl
  15. +1 −1 dom/interfaces/html/nsIDOMHTMLBodyElement.idl
  16. +1 −1 dom/interfaces/html/nsIDOMHTMLButtonElement.idl
  17. +1 −1 dom/interfaces/html/nsIDOMHTMLCanvasElement.idl
  18. +1 −1 dom/interfaces/html/nsIDOMHTMLCommandElement.idl
  19. +1 −1 dom/interfaces/html/nsIDOMHTMLDListElement.idl
  20. +1 −1 dom/interfaces/html/nsIDOMHTMLDataListElement.idl
  21. +1 −1 dom/interfaces/html/nsIDOMHTMLDirectoryElement.idl
  22. +1 −1 dom/interfaces/html/nsIDOMHTMLDivElement.idl
  23. +1 −1 dom/interfaces/html/nsIDOMHTMLElement.idl
  24. +1 −1 dom/interfaces/html/nsIDOMHTMLEmbedElement.idl
  25. +1 −1 dom/interfaces/html/nsIDOMHTMLFieldSetElement.idl
  26. +1 −1 dom/interfaces/html/nsIDOMHTMLFontElement.idl
  27. +1 −1 dom/interfaces/html/nsIDOMHTMLFormElement.idl
  28. +1 −1 dom/interfaces/html/nsIDOMHTMLFrameElement.idl
  29. +1 −1 dom/interfaces/html/nsIDOMHTMLFrameSetElement.idl
  30. +1 −1 dom/interfaces/html/nsIDOMHTMLHRElement.idl
  31. +1 −1 dom/interfaces/html/nsIDOMHTMLHeadElement.idl
  32. +1 −1 dom/interfaces/html/nsIDOMHTMLHeadingElement.idl
  33. +1 −1 dom/interfaces/html/nsIDOMHTMLHtmlElement.idl
  34. +1 −1 dom/interfaces/html/nsIDOMHTMLIFrameElement.idl
  35. +1 −1 dom/interfaces/html/nsIDOMHTMLImageElement.idl
  36. +1 −1 dom/interfaces/html/nsIDOMHTMLInputElement.idl
  37. +1 −1 dom/interfaces/html/nsIDOMHTMLLIElement.idl
  38. +1 −1 dom/interfaces/html/nsIDOMHTMLLabelElement.idl
  39. +1 −1 dom/interfaces/html/nsIDOMHTMLLegendElement.idl
  40. +1 −1 dom/interfaces/html/nsIDOMHTMLLinkElement.idl
  41. +1 −1 dom/interfaces/html/nsIDOMHTMLMapElement.idl
  42. +1 −1 dom/interfaces/html/nsIDOMHTMLMediaElement.idl
  43. +1 −1 dom/interfaces/html/nsIDOMHTMLMenuElement.idl
  44. +1 −1 dom/interfaces/html/nsIDOMHTMLMenuItemElement.idl
  45. +1 −1 dom/interfaces/html/nsIDOMHTMLMetaElement.idl
  46. +1 −1 dom/interfaces/html/nsIDOMHTMLModElement.idl
  47. +1 −1 dom/interfaces/html/nsIDOMHTMLOListElement.idl
  48. +1 −1 dom/interfaces/html/nsIDOMHTMLObjectElement.idl
  49. +1 −1 dom/interfaces/html/nsIDOMHTMLOptGroupElement.idl
  50. +1 −1 dom/interfaces/html/nsIDOMHTMLOptionElement.idl
  51. +1 −1 dom/interfaces/html/nsIDOMHTMLOutputElement.idl
  52. +1 −1 dom/interfaces/html/nsIDOMHTMLParagraphElement.idl
  53. +1 −1 dom/interfaces/html/nsIDOMHTMLParamElement.idl
  54. +1 −1 dom/interfaces/html/nsIDOMHTMLPreElement.idl
  55. +1 −1 dom/interfaces/html/nsIDOMHTMLProgressElement.idl
  56. +1 −1 dom/interfaces/html/nsIDOMHTMLQuoteElement.idl
  57. +1 −1 dom/interfaces/html/nsIDOMHTMLScriptElement.idl
  58. +1 −1 dom/interfaces/html/nsIDOMHTMLSelectElement.idl
  59. +1 −1 dom/interfaces/html/nsIDOMHTMLSourceElement.idl
  60. +1 −1 dom/interfaces/html/nsIDOMHTMLStyleElement.idl
  61. +1 −1 dom/interfaces/html/nsIDOMHTMLTableCaptionElem.idl
  62. +1 −1 dom/interfaces/html/nsIDOMHTMLTableCellElement.idl
  63. +1 −1 dom/interfaces/html/nsIDOMHTMLTableColElement.idl
  64. +1 −1 dom/interfaces/html/nsIDOMHTMLTableElement.idl
  65. +1 −1 dom/interfaces/html/nsIDOMHTMLTableRowElement.idl
  66. +1 −1 dom/interfaces/html/nsIDOMHTMLTableSectionElem.idl
  67. +1 −1 dom/interfaces/html/nsIDOMHTMLTextAreaElement.idl
  68. +1 −1 dom/interfaces/html/nsIDOMHTMLTitleElement.idl
  69. +1 −1 dom/interfaces/html/nsIDOMHTMLUListElement.idl
  70. +1 −1 dom/interfaces/html/nsIDOMHTMLUnknownElement.idl
  71. +1 −1 dom/interfaces/html/nsIDOMHTMLVideoElement.idl
  72. +1 −1 dom/interfaces/svg/nsIDOMSVGAElement.idl
  73. +1 −1 dom/interfaces/svg/nsIDOMSVGAltGlyphElement.idl
  74. +1 −1 dom/interfaces/svg/nsIDOMSVGAnimateElement.idl
  75. +1 −1 dom/interfaces/svg/nsIDOMSVGAnimateMotionElement.idl
  76. +1 −1 dom/interfaces/svg/nsIDOMSVGAnimateTransformElement.idl
  77. +1 −1 dom/interfaces/svg/nsIDOMSVGAnimationElement.idl
  78. +1 −1 dom/interfaces/svg/nsIDOMSVGCircleElement.idl
  79. +1 −1 dom/interfaces/svg/nsIDOMSVGClipPathElement.idl
  80. +1 −1 dom/interfaces/svg/nsIDOMSVGDefsElement.idl
  81. +1 −1 dom/interfaces/svg/nsIDOMSVGDescElement.idl
  82. +1 −1 dom/interfaces/svg/nsIDOMSVGElement.idl
  83. +1 −1 dom/interfaces/svg/nsIDOMSVGEllipseElement.idl
  84. +1 −1 dom/interfaces/svg/nsIDOMSVGFilterElement.idl
  85. +26 −26 dom/interfaces/svg/nsIDOMSVGFilters.idl
  86. +1 −1 dom/interfaces/svg/nsIDOMSVGForeignObjectElem.idl
  87. +1 −1 dom/interfaces/svg/nsIDOMSVGGElement.idl
  88. +3 −3 dom/interfaces/svg/nsIDOMSVGGradientElement.idl
  89. +1 −1 dom/interfaces/svg/nsIDOMSVGImageElement.idl
  90. +1 −1 dom/interfaces/svg/nsIDOMSVGLineElement.idl
  91. +1 −1 dom/interfaces/svg/nsIDOMSVGMarkerElement.idl
  92. +1 −1 dom/interfaces/svg/nsIDOMSVGMaskElement.idl
  93. +1 −1 dom/interfaces/svg/nsIDOMSVGMetadataElement.idl
  94. +1 −1 dom/interfaces/svg/nsIDOMSVGMpathElement.idl
  95. +1 −1 dom/interfaces/svg/nsIDOMSVGPathElement.idl
  96. +1 −1 dom/interfaces/svg/nsIDOMSVGPatternElement.idl
  97. +1 −1 dom/interfaces/svg/nsIDOMSVGPolygonElement.idl
  98. +1 −1 dom/interfaces/svg/nsIDOMSVGPolylineElement.idl
  99. +1 −1 dom/interfaces/svg/nsIDOMSVGRectElement.idl
  100. +1 −1 dom/interfaces/svg/nsIDOMSVGSVGElement.idl
  101. +1 −1 dom/interfaces/svg/nsIDOMSVGScriptElement.idl
  102. +1 −1 dom/interfaces/svg/nsIDOMSVGSetElement.idl
  103. +1 −1 dom/interfaces/svg/nsIDOMSVGStopElement.idl
  104. +1 −1 dom/interfaces/svg/nsIDOMSVGStyleElement.idl
  105. +1 −1 dom/interfaces/svg/nsIDOMSVGSwitchElement.idl
  106. +1 −1 dom/interfaces/svg/nsIDOMSVGSymbolElement.idl
  107. +1 −1 dom/interfaces/svg/nsIDOMSVGTSpanElement.idl
  108. +1 −1 dom/interfaces/svg/nsIDOMSVGTextContentElement.idl
  109. +1 −1 dom/interfaces/svg/nsIDOMSVGTextElement.idl
  110. +1 −1 dom/interfaces/svg/nsIDOMSVGTextPathElement.idl
  111. +1 −1 dom/interfaces/svg/nsIDOMSVGTextPositionElem.idl
  112. +1 −1 dom/interfaces/svg/nsIDOMSVGTitleElement.idl
  113. +1 −1 dom/interfaces/svg/nsIDOMSVGUseElement.idl
  114. +1 −1 dom/interfaces/xul/nsIDOMXULButtonElement.idl
  115. +1 −1 dom/interfaces/xul/nsIDOMXULCheckboxElement.idl
  116. +2 −2 dom/interfaces/xul/nsIDOMXULContainerElement.idl
  117. +1 −1 dom/interfaces/xul/nsIDOMXULControlElement.idl
  118. +1 −1 dom/interfaces/xul/nsIDOMXULDescriptionElement.idl
  119. +1 −1 dom/interfaces/xul/nsIDOMXULElement.idl
  120. +1 −1 dom/interfaces/xul/nsIDOMXULImageElement.idl
  121. +1 −1 dom/interfaces/xul/nsIDOMXULLabelElement.idl
  122. +1 −1 dom/interfaces/xul/nsIDOMXULLabeledControlEl.idl
  123. +1 −1 dom/interfaces/xul/nsIDOMXULMenuListElement.idl
  124. +1 −1 dom/interfaces/xul/nsIDOMXULMultSelectCntrlEl.idl
  125. +1 −1 dom/interfaces/xul/nsIDOMXULPopupElement.idl
  126. +1 −1 dom/interfaces/xul/nsIDOMXULSelectCntrlEl.idl
  127. +1 −1 dom/interfaces/xul/nsIDOMXULSelectCntrlItemEl.idl
  128. +1 −1 dom/interfaces/xul/nsIDOMXULTextboxElement.idl
  129. +1 −1 dom/interfaces/xul/nsIDOMXULTreeElement.idl
  130. +0 −1 extensions/widgetutils/src/nsWidgetUtils.cpp
  131. +41 −24 js/xpconnect/src/dom_quickstubs.qsconf
  132. +36 −36 widget/tests/TestWinTSF.cpp

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -49,7 +49,6 @@
#include "mozilla/dom/Element.h"
#include "nsIDOMElement.h"
#include "nsIDOMDocumentFragment.h"
-#include "nsIDOMNSElement.h"
#include "nsILinkHandler.h"
#include "nsNodeUtils.h"
#include "nsAttrAndChildArray.h"
@@ -228,7 +227,6 @@ class nsNodeSelectorTearoff : public nsIDOMNodeSelector
};
// Forward declare to allow being a friend
-class nsNSElementTearoff;
class nsTouchEventReceiverTearoff;
class nsInlineEventHandlersTearoff;
@@ -242,7 +240,6 @@ class nsGenericElement : public mozilla::dom::Element
nsGenericElement(already_AddRefed<nsINodeInfo> aNodeInfo);
virtual ~nsGenericElement();
- friend class nsNSElementTearoff;
friend class nsTouchEventReceiverTearoff;
friend class nsInlineEventHandlersTearoff;
@@ -435,37 +432,8 @@ class nsGenericElement : public mozilla::dom::Element
}
// nsIDOMElement method implementation
- NS_IMETHOD GetTagName(nsAString& aTagName);
- NS_IMETHOD GetAttribute(const nsAString& aName,
- nsAString& aReturn);
- NS_IMETHOD SetAttribute(const nsAString& aName,
- const nsAString& aValue);
- NS_IMETHOD RemoveAttribute(const nsAString& aName);
- NS_IMETHOD GetAttributeNode(const nsAString& aName,
- nsIDOMAttr** aReturn);
- NS_IMETHOD SetAttributeNode(nsIDOMAttr* aNewAttr, nsIDOMAttr** aReturn);
- NS_IMETHOD RemoveAttributeNode(nsIDOMAttr* aOldAttr, nsIDOMAttr** aReturn);
- NS_IMETHOD GetElementsByTagName(const nsAString& aTagname,
- nsIDOMNodeList** aReturn);
- NS_IMETHOD GetAttributeNS(const nsAString& aNamespaceURI,
- const nsAString& aLocalName,
- nsAString& aReturn);
- NS_IMETHOD SetAttributeNS(const nsAString& aNamespaceURI,
- const nsAString& aQualifiedName,
- const nsAString& aValue);
- NS_IMETHOD RemoveAttributeNS(const nsAString& aNamespaceURI,
- const nsAString& aLocalName);
- NS_IMETHOD GetAttributeNodeNS(const nsAString& aNamespaceURI,
- const nsAString& aLocalName,
- nsIDOMAttr** aReturn);
- NS_IMETHOD SetAttributeNodeNS(nsIDOMAttr* aNewAttr, nsIDOMAttr** aReturn);
- NS_IMETHOD GetElementsByTagNameNS(const nsAString& aNamespaceURI,
- const nsAString& aLocalName,
- nsIDOMNodeList** aReturn);
- NS_IMETHOD HasAttribute(const nsAString& aName, bool* aReturn);
- NS_IMETHOD HasAttributeNS(const nsAString& aNamespaceURI,
- const nsAString& aLocalName,
- bool* aReturn);
+ NS_DECL_NSIDOMELEMENT
+
nsresult CloneNode(bool aDeep, nsIDOMNode **aResult)
{
return nsNodeUtils::CloneNodeImpl(this, aDeep, true, aResult);
@@ -597,15 +565,8 @@ class nsGenericElement : public mozilla::dom::Element
{
}
- // nsIDOMNSElement methods
- nsresult GetElementsByClassName(const nsAString& aClasses,
- nsIDOMNodeList** aReturn);
- nsresult GetClientRects(nsIDOMClientRectList** aResult);
- nsresult GetBoundingClientRect(nsIDOMClientRect** aResult);
PRInt32 GetScrollTop();
- void SetScrollTop(PRInt32 aScrollTop);
PRInt32 GetScrollLeft();
- void SetScrollLeft(PRInt32 aScrollLeft);
PRInt32 GetScrollHeight();
PRInt32 GetScrollWidth();
PRInt32 GetClientTop()
@@ -628,35 +589,7 @@ class nsGenericElement : public mozilla::dom::Element
nsIContent* GetLastElementChild();
nsIContent* GetPreviousElementSibling();
nsIContent* GetNextElementSibling();
- nsresult GetChildElementCount(PRUint32* aResult)
- {
- nsContentList* list = GetChildrenList();
- if (!list) {
- *aResult = 0;
-
- return NS_ERROR_OUT_OF_MEMORY;
- }
-
- *aResult = list->Length(true);
-
- return NS_OK;
- }
- nsresult GetChildren(nsIDOMNodeList** aResult)
- {
- nsContentList* list = GetChildrenList();
- if (!list) {
- *aResult = nsnull;
-
- return NS_ERROR_OUT_OF_MEMORY;
- }
-
- NS_ADDREF(*aResult = list);
-
- return NS_OK;
- }
nsIDOMDOMTokenList* GetClassList(nsresult *aResult);
- void SetCapture(bool aRetargetToElement);
- void ReleaseCapture();
bool MozMatchesSelector(const nsAString& aSelector, nsresult* aResult);
/**
@@ -1067,27 +1000,6 @@ _elementName::Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const \
}
/**
- * Yet another tearoff class for nsGenericElement
- * to implement additional interfaces
- */
-class nsNSElementTearoff : public nsIDOMNSElement
-{
-public:
- NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-
- NS_DECL_NSIDOMNSELEMENT
-
- NS_DECL_CYCLE_COLLECTION_CLASS(nsNSElementTearoff)
-
- nsNSElementTearoff(nsGenericElement *aContent) : mContent(aContent)
- {
- }
-
-private:
- nsRefPtr<nsGenericElement> mContent;
-};
-
-/**
* Tearoff class to implement nsITouchEventReceiver
*/
class nsTouchEventReceiverTearoff : public nsITouchEventReceiver
@@ -31,8 +31,7 @@
allTags.push(aTagName);
classInfos[aTagName] = aImplClass;
interfaces[aTagName] =
- [ "nsIDOMNSElement",
- "nsIDOMEventTarget",
+ [ "nsIDOMEventTarget",
"nsIDOMElementCSSInlineStyle",
"nsIDOMNodeSelector",
"nsITouchEventReceiver",
@@ -145,7 +145,6 @@
#include "nsIDOMDOMStringList.h"
#include "nsIDOMDOMTokenList.h"
#include "nsIDOMDOMSettableTokenList.h"
-#include "nsIDOMNSElement.h"
#include "nsDOMStringMap.h"
@@ -2327,7 +2326,6 @@ nsDOMClassInfo::RegisterExternalClasses()
#define DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES \
DOM_CLASSINFO_MAP_ENTRY(nsIDOMElementCSSInlineStyle) \
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget) \
- DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSElement) \
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNodeSelector) \
DOM_CLASSINFO_MAP_ENTRY(nsIInlineEventHandlers) \
DOM_CLASSINFO_MAP_CONDITIONAL_ENTRY(nsITouchEventReceiver, \
@@ -2509,7 +2507,6 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_BEGIN(Element, nsIDOMElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMElement)
- DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNodeSelector)
DOM_CLASSINFO_MAP_ENTRY(nsIInlineEventHandlers)
@@ -3043,7 +3040,6 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_BEGIN(XULElement, nsIDOMXULElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMXULElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
- DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMElementCSSInlineStyle)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNodeSelector)
DOM_CLASSINFO_MAP_ENTRY(nsIInlineEventHandlers)
@@ -3147,7 +3143,6 @@ nsDOMClassInfo::Init()
#define DOM_CLASSINFO_SVG_ELEMENT_MAP_ENTRIES \
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget) \
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGElement) \
- DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSElement) \
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNodeSelector) \
DOM_CLASSINFO_MAP_ENTRY(nsIInlineEventHandlers) \
DOM_CLASSINFO_MAP_CONDITIONAL_ENTRY(nsITouchEventReceiver, \
@@ -4141,7 +4136,6 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(MathMLElement, nsIDOMElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMElement)
- DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMNodeSelector)
DOM_CLASSINFO_MAP_ENTRY(nsIInlineEventHandlers)
@@ -58,7 +58,6 @@ interface nsIDOMDocument;
interface nsIDOMDocumentFragment;
interface nsIDOMDocumentType;
interface nsIDOMElement;
-interface nsIDOMNSElement;
interface nsIDOMNamedNodeMap;
interface nsIDOMNode;
interface nsIDOMNodeList;
@@ -68,7 +68,6 @@ XPIDLSRCS = \
nsIDOMXMLDocument.idl \
nsIDOMUserDataHandler.idl \
nsIDOMNSEditableElement.idl \
- nsIDOMNSElement.idl \
nsIDOMNodeSelector.idl \
nsIDOMDOMTokenList.idl \
nsIDOMDOMSettableTokenList.idl \
Oops, something went wrong.

0 comments on commit 7f98143

Please sign in to comment.