Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
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...
commit 7f981436b62d96b579e77c7f90bfa61485ea2296 2 parents 458db58 + 99c32a5
@bzbarsky bzbarsky authored
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
View
186 content/base/src/nsGenericElement.cpp
@@ -100,7 +100,6 @@
#include "nsIXBLService.h"
#include "nsPIDOMWindow.h"
#include "nsPIBoxObject.h"
-#include "nsIDOMNSElement.h"
#include "nsClientRect.h"
#include "nsSVGUtils.h"
#include "nsLayoutUtils.h"
@@ -1751,41 +1750,56 @@ nsGenericElement::GetNextElementSibling()
}
NS_IMETHODIMP
-nsNSElementTearoff::GetFirstElementChild(nsIDOMElement** aResult)
+nsGenericElement::GetChildElementCount(PRUint32* aResult)
+{
+ *aResult = GetChildrenList()->Length(true);
+ return NS_OK;
+}
+
+// readonly attribute nsIDOMNodeList children
+NS_IMETHODIMP
+nsGenericElement::GetChildElements(nsIDOMNodeList** aResult)
+{
+ NS_ADDREF(*aResult = GetChildrenList());
+ return NS_OK;
+}
+
+NS_IMETHODIMP
+nsGenericElement::GetFirstElementChild(nsIDOMElement** aResult)
{
*aResult = nsnull;
- nsIContent *result = mContent->GetFirstElementChild();
+ nsIContent *result = GetFirstElementChild();
return result ? CallQueryInterface(result, aResult) : NS_OK;
}
NS_IMETHODIMP
-nsNSElementTearoff::GetLastElementChild(nsIDOMElement** aResult)
+nsGenericElement::GetLastElementChild(nsIDOMElement** aResult)
{
*aResult = nsnull;
- nsIContent *result = mContent->GetLastElementChild();
+ nsIContent *result = GetLastElementChild();
return result ? CallQueryInterface(result, aResult) : NS_OK;
}
NS_IMETHODIMP
-nsNSElementTearoff::GetPreviousElementSibling(nsIDOMElement** aResult)
+nsGenericElement::GetPreviousElementSibling(nsIDOMElement** aResult)
{
*aResult = nsnull;
- nsIContent *result = mContent->GetPreviousElementSibling();
+ nsIContent *result = GetPreviousElementSibling();
return result ? CallQueryInterface(result, aResult) : NS_OK;
}
NS_IMETHODIMP
-nsNSElementTearoff::GetNextElementSibling(nsIDOMElement** aResult)
+nsGenericElement::GetNextElementSibling(nsIDOMElement** aResult)
{
*aResult = nsnull;
- nsIContent *result = mContent->GetNextElementSibling();
+ nsIContent *result = GetNextElementSibling();
return result ? CallQueryInterface(result, aResult) : NS_OK;
}
@@ -1804,18 +1818,6 @@ nsGenericElement::GetChildrenList()
return slots->mChildrenList;
}
-NS_IMETHODIMP
-nsNSElementTearoff::GetChildElementCount(PRUint32* aResult)
-{
- return mContent->GetChildElementCount(aResult);
-}
-
-NS_IMETHODIMP
-nsNSElementTearoff::GetChildren(nsIDOMNodeList** aResult)
-{
- return mContent->GetChildren(aResult);
-}
-
nsIDOMDOMTokenList*
nsGenericElement::GetClassList(nsresult *aResult)
{
@@ -1832,7 +1834,6 @@ nsGenericElement::GetClassList(nsresult *aResult)
}
slots->mClassList = new nsDOMTokenList(this, classAttr);
- NS_ENSURE_TRUE(slots->mClassList, nsnull);
}
*aResult = NS_OK;
@@ -1841,12 +1842,12 @@ nsGenericElement::GetClassList(nsresult *aResult)
}
NS_IMETHODIMP
-nsNSElementTearoff::GetClassList(nsIDOMDOMTokenList** aResult)
+nsGenericElement::GetClassList(nsIDOMDOMTokenList** aResult)
{
*aResult = nsnull;
nsresult rv;
- nsIDOMDOMTokenList* list = mContent->GetClassList(&rv);
+ nsIDOMDOMTokenList* list = GetClassList(&rv);
NS_ENSURE_TRUE(list, rv);
NS_ADDREF(*aResult = list);
@@ -1854,63 +1855,31 @@ nsNSElementTearoff::GetClassList(nsIDOMDOMTokenList** aResult)
return NS_OK;
}
-void
+NS_IMETHODIMP
nsGenericElement::SetCapture(bool aRetargetToElement)
{
// If there is already an active capture, ignore this request. This would
// occur if a splitter, frame resizer, etc had already captured and we don't
// want to override those.
if (nsIPresShell::GetCapturingContent())
- return;
+ return NS_OK;
nsIPresShell::SetCapturingContent(this, CAPTURE_PREVENTDRAG |
(aRetargetToElement ? CAPTURE_RETARGETTOELEMENT : 0));
-}
-
-NS_IMETHODIMP
-nsNSElementTearoff::SetCapture(bool aRetargetToElement)
-{
- mContent->SetCapture(aRetargetToElement);
return NS_OK;
}
-void
+NS_IMETHODIMP
nsGenericElement::ReleaseCapture()
{
if (nsIPresShell::GetCapturingContent() == this) {
nsIPresShell::SetCapturingContent(nsnull, 0);
}
-}
-
-NS_IMETHODIMP
-nsNSElementTearoff::ReleaseCapture()
-{
- mContent->ReleaseCapture();
return NS_OK;
}
-//----------------------------------------------------------------------
-
-
-NS_IMPL_CYCLE_COLLECTION_1(nsNSElementTearoff, mContent)
-
-NS_INTERFACE_MAP_BEGIN(nsNSElementTearoff)
- NS_INTERFACE_MAP_ENTRY(nsIDOMNSElement)
- NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsNSElementTearoff)
-NS_INTERFACE_MAP_END_AGGREGATED(mContent)
-
-NS_IMPL_CYCLE_COLLECTING_ADDREF(nsNSElementTearoff)
-NS_IMPL_CYCLE_COLLECTING_RELEASE(nsNSElementTearoff)
-
-NS_IMETHODIMP
-nsNSElementTearoff::GetElementsByClassName(const nsAString& aClasses,
- nsIDOMNodeList** aReturn)
-{
- return mContent->GetElementsByClassName(aClasses, aReturn);
-}
-
nsIFrame*
nsGenericElement::GetStyledFrame()
{
@@ -1998,14 +1967,14 @@ nsGenericElement::GetScrollTop()
}
NS_IMETHODIMP
-nsNSElementTearoff::GetScrollTop(PRInt32* aScrollTop)
+nsGenericElement::GetScrollTop(PRInt32* aScrollTop)
{
- *aScrollTop = mContent->GetScrollTop();
+ *aScrollTop = GetScrollTop();
return NS_OK;
}
-void
+NS_IMETHODIMP
nsGenericElement::SetScrollTop(PRInt32 aScrollTop)
{
nsIScrollableFrame* sf = GetScrollFrame();
@@ -2014,13 +1983,6 @@ nsGenericElement::SetScrollTop(PRInt32 aScrollTop)
pt.y = nsPresContext::CSSPixelsToAppUnits(aScrollTop);
sf->ScrollTo(pt, nsIScrollableFrame::INSTANT);
}
-}
-
-NS_IMETHODIMP
-nsNSElementTearoff::SetScrollTop(PRInt32 aScrollTop)
-{
- mContent->SetScrollTop(aScrollTop);
-
return NS_OK;
}
@@ -2035,14 +1997,14 @@ nsGenericElement::GetScrollLeft()
}
NS_IMETHODIMP
-nsNSElementTearoff::GetScrollLeft(PRInt32* aScrollLeft)
+nsGenericElement::GetScrollLeft(PRInt32* aScrollLeft)
{
- *aScrollLeft = mContent->GetScrollLeft();
+ *aScrollLeft = GetScrollLeft();
return NS_OK;
}
-void
+NS_IMETHODIMP
nsGenericElement::SetScrollLeft(PRInt32 aScrollLeft)
{
nsIScrollableFrame* sf = GetScrollFrame();
@@ -2051,13 +2013,6 @@ nsGenericElement::SetScrollLeft(PRInt32 aScrollLeft)
pt.x = nsPresContext::CSSPixelsToAppUnits(aScrollLeft);
sf->ScrollTo(pt, nsIScrollableFrame::INSTANT);
}
-}
-
-NS_IMETHODIMP
-nsNSElementTearoff::SetScrollLeft(PRInt32 aScrollLeft)
-{
- mContent->SetScrollLeft(aScrollLeft);
-
return NS_OK;
}
@@ -2080,9 +2035,9 @@ nsGenericElement::GetScrollHeight()
}
NS_IMETHODIMP
-nsNSElementTearoff::GetScrollHeight(PRInt32* aScrollHeight)
+nsGenericElement::GetScrollHeight(PRInt32* aScrollHeight)
{
- *aScrollHeight = mContent->GetScrollHeight();
+ *aScrollHeight = GetScrollHeight();
return NS_OK;
}
@@ -2106,9 +2061,9 @@ nsGenericElement::GetScrollWidth()
}
NS_IMETHODIMP
-nsNSElementTearoff::GetScrollWidth(PRInt32 *aScrollWidth)
+nsGenericElement::GetScrollWidth(PRInt32 *aScrollWidth)
{
- *aScrollWidth = mContent->GetScrollWidth();
+ *aScrollWidth = GetScrollWidth();
return NS_OK;
}
@@ -2136,41 +2091,38 @@ nsGenericElement::GetClientAreaRect()
}
NS_IMETHODIMP
-nsNSElementTearoff::GetClientTop(PRInt32 *aClientTop)
+nsGenericElement::GetClientTop(PRInt32 *aClientTop)
{
- *aClientTop = mContent->GetClientTop();
+ *aClientTop = GetClientTop();
return NS_OK;
}
NS_IMETHODIMP
-nsNSElementTearoff::GetClientLeft(PRInt32 *aClientLeft)
+nsGenericElement::GetClientLeft(PRInt32 *aClientLeft)
{
- *aClientLeft = mContent->GetClientLeft();
+ *aClientLeft = GetClientLeft();
return NS_OK;
}
NS_IMETHODIMP
-nsNSElementTearoff::GetClientHeight(PRInt32 *aClientHeight)
+nsGenericElement::GetClientHeight(PRInt32 *aClientHeight)
{
- *aClientHeight = mContent->GetClientHeight();
+ *aClientHeight = GetClientHeight();
return NS_OK;
}
NS_IMETHODIMP
-nsNSElementTearoff::GetClientWidth(PRInt32 *aClientWidth)
+nsGenericElement::GetClientWidth(PRInt32 *aClientWidth)
{
- *aClientWidth = mContent->GetClientWidth();
+ *aClientWidth = GetClientWidth();
return NS_OK;
}
-nsresult
+NS_IMETHODIMP
nsGenericElement::GetBoundingClientRect(nsIDOMClientRect** aResult)
{
// Weak ref, since we addref it below
nsClientRect* rect = new nsClientRect();
- if (!rect)
- return NS_ERROR_OUT_OF_MEMORY;
-
NS_ADDREF(*aResult = rect);
nsIFrame* frame = GetPrimaryFrame(Flush_Layout);
@@ -2187,26 +2139,18 @@ nsGenericElement::GetBoundingClientRect(nsIDOMClientRect** aResult)
}
NS_IMETHODIMP
-nsNSElementTearoff::GetBoundingClientRect(nsIDOMClientRect** aResult)
-{
- return mContent->GetBoundingClientRect(aResult);
-}
-
-nsresult
nsGenericElement::GetElementsByClassName(const nsAString& aClasses,
nsIDOMNodeList** aReturn)
{
return nsContentUtils::GetElementsByClassName(this, aClasses, aReturn);
}
-nsresult
+NS_IMETHODIMP
nsGenericElement::GetClientRects(nsIDOMClientRectList** aResult)
{
*aResult = nsnull;
nsRefPtr<nsClientRectList> rectList = new nsClientRectList();
- if (!rectList)
- return NS_ERROR_OUT_OF_MEMORY;
nsIFrame* frame = GetPrimaryFrame(Flush_Layout);
if (!frame) {
@@ -2225,11 +2169,6 @@ nsGenericElement::GetClientRects(nsIDOMClientRectList** aResult)
return NS_OK;
}
-NS_IMETHODIMP
-nsNSElementTearoff::GetClientRects(nsIDOMClientRectList** aResult)
-{
- return mContent->GetClientRects(aResult);
-}
//----------------------------------------------------------------------
@@ -4796,7 +4735,6 @@ NS_INTERFACE_MAP_BEGIN(nsGenericElement)
NS_INTERFACE_MAP_ENTRY(nsIContent)
NS_INTERFACE_MAP_ENTRY(nsINode)
NS_INTERFACE_MAP_ENTRY(nsIDOMEventTarget)
- NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOMNSElement, new nsNSElementTearoff(this))
NS_INTERFACE_MAP_ENTRY_TEAROFF(nsISupportsWeakReference,
new nsNodeSupportsWeakRefTearoff(this))
NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOMNodeSelector,
@@ -5956,12 +5894,12 @@ nsGenericElement::MozMatchesSelector(const nsAString& aSelector, nsresult* aResu
}
NS_IMETHODIMP
-nsNSElementTearoff::MozMatchesSelector(const nsAString& aSelector, bool* aReturn)
+nsGenericElement::MozMatchesSelector(const nsAString& aSelector, bool* aReturn)
{
NS_PRECONDITION(aReturn, "Null out param?");
nsresult rv;
- *aReturn = mContent->MozMatchesSelector(aSelector, &rv);
+ *aReturn = MozMatchesSelector(aSelector, &rv);
return rv;
}
@@ -6021,6 +5959,30 @@ nsGenericElement::SizeOf() const
#undef TOUCH_EVENT
#undef EVENT
+NS_IMETHODIMP
+nsGenericElement::GetOnmouseenter(JSContext* cx, JS::Value* vp)
+{
+ return nsINode::GetOnmouseenter(cx, vp);
+}
+
+NS_IMETHODIMP
+nsGenericElement::SetOnmouseenter(JSContext* cx, const JS::Value& v)
+{
+ return nsINode::SetOnmouseenter(cx, v);
+}
+
+NS_IMETHODIMP
+nsGenericElement::GetOnmouseleave(JSContext* cx, JS::Value* vp)
+{
+ return nsINode::GetOnmouseleave(cx, vp);
+}
+
+NS_IMETHODIMP
+nsGenericElement::SetOnmouseleave(JSContext* cx, const JS::Value& v)
+{
+ return nsINode::SetOnmouseleave(cx, v);
+}
+
bool
nsINode::Contains(const nsINode* aOther) const
{
View
92 content/base/src/nsGenericElement.h
@@ -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
View
3  content/html/content/test/test_bug389797.html
@@ -31,8 +31,7 @@
allTags.push(aTagName);
classInfos[aTagName] = aImplClass;
interfaces[aTagName] =
- [ "nsIDOMNSElement",
- "nsIDOMEventTarget",
+ [ "nsIDOMEventTarget",
"nsIDOMElementCSSInlineStyle",
"nsIDOMNodeSelector",
"nsITouchEventReceiver",
View
6 dom/base/nsDOMClassInfo.cpp
@@ -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)
View
1  dom/interfaces/base/domstubs.idl
@@ -58,7 +58,6 @@ interface nsIDOMDocument;
interface nsIDOMDocumentFragment;
interface nsIDOMDocumentType;
interface nsIDOMElement;
-interface nsIDOMNSElement;
interface nsIDOMNamedNodeMap;
interface nsIDOMNode;
interface nsIDOMNodeList;
View
1  dom/interfaces/core/Makefile.in
@@ -68,7 +68,6 @@ XPIDLSRCS = \
nsIDOMXMLDocument.idl \
nsIDOMUserDataHandler.idl \
nsIDOMNSEditableElement.idl \
- nsIDOMNSElement.idl \
nsIDOMNodeSelector.idl \
nsIDOMDOMTokenList.idl \
nsIDOMDOMSettableTokenList.idl \
View
183 dom/interfaces/core/nsIDOMElement.idl
@@ -22,6 +22,8 @@
* Contributor(s):
* Vidur Apparao <vidur@netscape.com> (original author)
* Johnny Stenback <jst@netscape.com>
+ * Robert Sayre <sayrer@gmail.com>
+ * Ms2ger <ms2ger@gmail.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -44,52 +46,177 @@
* XML document.
*
* For more information on this interface please see
- * http://www.w3.org/TR/DOM-Level-2-Core/
+ * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#interface-element
*/
-[scriptable, uuid(1f249e8b-7b41-44c0-a8d5-15298c1198cd)]
+[scriptable, uuid(f561753a-1d4f-40c1-b147-ea955fc6fd94)]
interface nsIDOMElement : nsIDOMNode
{
readonly attribute DOMString tagName;
+
+ /**
+ * Returns a DOMTokenList object reflecting the class attribute.
+ */
+ readonly attribute nsIDOMDOMTokenList classList;
+
DOMString getAttribute(in DOMString name);
- void setAttribute(in DOMString name,
- in DOMString value)
- raises(DOMException);
- void removeAttribute(in DOMString name)
- raises(DOMException);
- nsIDOMAttr getAttributeNode(in DOMString name);
- nsIDOMAttr setAttributeNode(in nsIDOMAttr newAttr)
- raises(DOMException);
- nsIDOMAttr removeAttributeNode(in nsIDOMAttr oldAttr)
- raises(DOMException);
- nsIDOMNodeList getElementsByTagName(in DOMString name);
- // Introduced in DOM Level 2:
DOMString getAttributeNS(in DOMString namespaceURI,
in DOMString localName);
- // Introduced in DOM Level 2:
+ void setAttribute(in DOMString name,
+ in DOMString value);
void setAttributeNS(in DOMString namespaceURI,
in DOMString qualifiedName,
- in DOMString value)
- raises(DOMException);
- // Introduced in DOM Level 2:
+ in DOMString value);
+ void removeAttribute(in DOMString name);
void removeAttributeNS(in DOMString namespaceURI,
- in DOMString localName)
- raises(DOMException);
- // Introduced in DOM Level 2:
+ in DOMString localName);
+ boolean hasAttribute(in DOMString name);
+ boolean hasAttributeNS(in DOMString namespaceURI,
+ in DOMString localName);
+
+ // Obsolete methods.
+ nsIDOMAttr getAttributeNode(in DOMString name);
+ nsIDOMAttr setAttributeNode(in nsIDOMAttr newAttr);
+ nsIDOMAttr removeAttributeNode(in nsIDOMAttr oldAttr);
nsIDOMAttr getAttributeNodeNS(in DOMString namespaceURI,
in DOMString localName);
- // Introduced in DOM Level 2:
nsIDOMAttr setAttributeNodeNS(in nsIDOMAttr newAttr)
raises(DOMException);
- // Introduced in DOM Level 2:
+
+ nsIDOMNodeList getElementsByTagName(in DOMString name);
nsIDOMNodeList getElementsByTagNameNS(in DOMString namespaceURI,
in DOMString localName);
- // Introduced in DOM Level 2:
- boolean hasAttribute(in DOMString name);
- // Introduced in DOM Level 2:
- boolean hasAttributeNS(in DOMString namespaceURI,
- in DOMString localName);
+ /**
+ * Retrieve elements matching all classes listed in a
+ * space-separated string.
+ */
+ nsIDOMNodeList getElementsByClassName(in DOMString classes);
+
+ /**
+ * Returns a live nsIDOMNodeList of the current child elements.
+ */
+ [binaryname(ChildElements)]
+ readonly attribute nsIDOMNodeList children;
+ /**
+ * Similar as the attributes on nsIDOMNode, but navigates just elements
+ * rather than all nodes.
+ */
+ readonly attribute nsIDOMElement firstElementChild;
+ readonly attribute nsIDOMElement lastElementChild;
+ readonly attribute nsIDOMElement previousElementSibling;
+ readonly attribute nsIDOMElement nextElementSibling;
+ /**
+ * Returns the number of child nodes that are nsIDOMElements.
+ */
+ readonly attribute unsigned long childElementCount;
+
+ // HTML
[implicit_jscontext] attribute jsval onmouseenter;
[implicit_jscontext] attribute jsval onmouseleave;
+
+
+ // CSSOM View
+ /**
+ * Retrieve a list of rectangles, one for each CSS border-box associated with
+ * the element. The coordinates are in CSS pixels, and relative to
+ * the top-left of the document's viewport, unless the document
+ * has an SVG foreignobject ancestor, in which case the coordinates are
+ * relative to the top-left of the content box of the nearest SVG foreignobject
+ * ancestor. The coordinates are calculated as if every scrollable element
+ * is scrolled to its default position.
+ *
+ * Note: the boxes of overflowing children do not affect these rectangles.
+ * Note: some elements have empty CSS boxes. Those return empty rectangles,
+ * but the coordinates may still be meaningful.
+ * Note: some elements have no CSS boxes (including display:none elements,
+ * HTML AREA elements, and SVG elements that do not render). Those return
+ * an empty list.
+ */
+ nsIDOMClientRectList getClientRects();
+
+ /**
+ * Returns the union of all rectangles in the getClientRects() list. Empty
+ * rectangles are ignored, except that if all rectangles are empty,
+ * we return an empty rectangle positioned at the top-left of the first
+ * rectangle in getClientRects().
+ */
+ nsIDOMClientRect getBoundingClientRect();
+
+ /**
+ * The vertical scroll position of the element, or 0 if the element is not
+ * scrollable. This property may be assigned a value to change the
+ * vertical scroll position.
+ */
+ attribute long scrollTop;
+
+ /**
+ * The horizontal scroll position of the element, or 0 if the element is not
+ * scrollable. This property may be assigned a value to change the
+ * horizontal scroll position.
+ */
+ attribute long scrollLeft;
+
+ /**
+ * The width of the scrollable area of the element. If the element is not
+ * scrollable, scrollWidth is equivalent to the offsetWidth.
+ */
+ readonly attribute long scrollWidth;
+
+ /**
+ * The height of the scrollable area of the element. If the element is not
+ * scrollable, scrollHeight is equivalent to the offsetHeight.
+ */
+ readonly attribute long scrollHeight;
+
+ /**
+ * The height in CSS pixels of the element's top border.
+ */
+ readonly attribute long clientTop;
+
+ /**
+ * The width in CSS pixels of the element's left border and scrollbar
+ * if it is present on the left side.
+ */
+ readonly attribute long clientLeft;
+
+ /**
+ * The height in CSS pixels of the element's padding box. If the element is
+ * scrollable, the scroll bars are included inside this width.
+ */
+ readonly attribute long clientWidth;
+
+ /**
+ * The width in CSS pixels of the element's padding box. If the element is
+ * scrollable, the scroll bars are included inside this height.
+ */
+ readonly attribute long clientHeight;
+
+
+ // Selectors API
+ /**
+ * Returns whether this element would be selected by the given selector
+ * string.
+ *
+ * See <http://dev.w3.org/2006/webapi/selectors-api2/#matchesselector>
+ */
+ boolean mozMatchesSelector([Null(Stringify)] in DOMString selector);
+
+
+ // Proprietary extensions
+ /**
+ * Set this during a mousedown event to grab and retarget all mouse events
+ * to this element until the mouse button is released or releaseCapture is
+ * called. If retargetToElement is true, then all events are targetted at
+ * this element. If false, events can also fire at descendants of this
+ * element.
+ *
+ */
+ void setCapture([optional] in boolean retargetToElement);
+
+ /**
+ * If this element has captured the mouse, release the capture. If another
+ * element has captured the mouse, this method has no effect.
+ */
+ void releaseCapture();
};
View
179 dom/interfaces/core/nsIDOMNSElement.idl
@@ -1,179 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2007
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Robert Sayre <sayrer@gmail.com> (original author)
- *
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "domstubs.idl"
-
-[scriptable, uuid(D894B5D4-44F3-422A-A220-7763C12D4A94)]
-interface nsIDOMNSElement : nsISupports
-{
- /*
- * Retrieve elements matching all classes listed in a
- * space-separated string.
- *
- * See <http://whatwg.org/specs/web-apps/current-work/>
- */
- nsIDOMNodeList getElementsByClassName(in DOMString classes);
-
- /*
- * Retrieve a list of rectangles, one for each CSS border-box associated with
- * the element. The coordinates are in CSS pixels, and relative to
- * the top-left of the document's viewport, unless the document
- * has an SVG foreignobject ancestor, in which case the coordinates are
- * relative to the top-left of the content box of the nearest SVG foreignobject
- * ancestor. The coordinates are calculated as if every scrollable element
- * is scrolled to its default position.
- *
- * Note: the boxes of overflowing children do not affect these rectangles.
- * Note: some elements have empty CSS boxes. Those return empty rectangles,
- * but the coordinates may still be meaningful.
- * Note: some elements have no CSS boxes (including display:none elements,
- * HTML AREA elements, and SVG elements that do not render). Those return
- * an empty list.
- */
- nsIDOMClientRectList getClientRects();
-
- /**
- * Returns the union of all rectangles in the getClientRects() list. Empty
- * rectangles are ignored, except that if all rectangles are empty,
- * we return an empty rectangle positioned at the top-left of the first
- * rectangle in getClientRects().
- */
- nsIDOMClientRect getBoundingClientRect();
-
- /**
- * The vertical scroll position of the element, or 0 if the element is not
- * scrollable. This property may be assigned a value to change the
- * vertical scroll position.
- */
- attribute long scrollTop;
-
- /**
- * The horizontal scroll position of the element, or 0 if the element is not
- * scrollable. This property may be assigned a value to change the
- * horizontal scroll position.
- */
- attribute long scrollLeft;
-
- /**
- * The height of the scrollable area of the element. If the element is not
- * scrollable, scrollHeight is equivalent to the offsetHeight.
- */
- readonly attribute long scrollHeight;
-
- /**
- * The width of the scrollable area of the element. If the element is not
- * scrollable, scrollWidth is equivalent to the offsetWidth.
- */
- readonly attribute long scrollWidth;
-
- /**
- * The height in CSS pixels of the element's top border.
- */
- readonly attribute long clientTop;
-
- /**
- * The width in CSS pixels of the element's left border and scrollbar
- * if it is present on the left side.
- */
- readonly attribute long clientLeft;
-
- /**
- * The width in CSS pixels of the element's padding box. If the element is
- * scrollable, the scroll bars are included inside this height.
- */
- readonly attribute long clientHeight;
-
- /**
- * The height in CSS pixels of the element's padding box. If the element is
- * scrollable, the scroll bars are included inside this width.
- */
- readonly attribute long clientWidth;
-
- /**
- * Similar as the attributes on nsIDOMNode, but navigates just elements
- * rather than all nodes.
- *
- * Defined by the ElementTraversal spec.
- */
- readonly attribute nsIDOMElement firstElementChild;
- readonly attribute nsIDOMElement lastElementChild;
- readonly attribute nsIDOMElement previousElementSibling;
- readonly attribute nsIDOMElement nextElementSibling;
-
- /**
- * Returns the number of child nodes that are nsIDOMElements.
- *
- * Defined by the ElementTraversal spec.
- */
- readonly attribute unsigned long childElementCount;
-
- /**
- * Returns a live nsIDOMNodeList of the current child elements.
- */
- readonly attribute nsIDOMNodeList children;
-
- /**
- * Returns a DOMTokenList object reflecting the class attribute.
- */
- readonly attribute nsIDOMDOMTokenList classList;
-
- /**
- * Set this during a mousedown event to grab and retarget all mouse events
- * to this element until the mouse button is released or releaseCapture is
- * called. If retargetToElement is true, then all events are targetted at
- * this element. If false, events can also fire at descendants of this
- * element.
- *
- */
- void setCapture([optional] in boolean retargetToElement);
-
- /**
- * If this element has captured the mouse, release the capture. If another
- * element has captured the mouse, this method has no effect.
- */
- void releaseCapture();
-
- /**
- * Returns whether this element would be selected by the given selector
- * string.
- *
- * See <http://dev.w3.org/2006/webapi/selectors-api2/>
- */
- boolean mozMatchesSelector([Null(Stringify)] in DOMString selector);
-};
View
2  dom/interfaces/html/nsIDOMHTMLAnchorElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(bcb54394-d9f8-4bcb-bbbb-eca9826cdbca)]
+[scriptable, uuid(44a9c8e1-2c95-41e4-86f1-96033a452a4d)]
interface nsIDOMHTMLAnchorElement : nsIDOMHTMLElement
{
attribute DOMString href;
View
2  dom/interfaces/html/nsIDOMHTMLAppletElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(a06bca18-791f-474e-a031-bf6c2bd14994)]
+[scriptable, uuid(962eefd6-8728-4626-82b4-b008aaca00d4)]
interface nsIDOMHTMLAppletElement : nsIDOMHTMLElement
{
attribute DOMString align;
View
2  dom/interfaces/html/nsIDOMHTMLAreaElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(7e607c36-aecc-4dee-a93a-95e22a374bfb)]
+[scriptable, uuid(293d9f21-df16-4706-91d5-f6381f9db554)]
interface nsIDOMHTMLAreaElement : nsIDOMHTMLElement
{
attribute DOMString alt;
View
2  dom/interfaces/html/nsIDOMHTMLAudioElement.idl
@@ -52,7 +52,7 @@
* @status UNDER_DEVELOPMENT
*/
-[scriptable, uuid(502dd802-e58e-4af8-a7fe-e370300ce196)]
+[scriptable, uuid(390c059a-0a26-4a44-96b6-3f8817bf92e9)]
interface nsIDOMHTMLAudioElement : nsIDOMHTMLMediaElement
{
// Setup the audio stream for writing
View
2  dom/interfaces/html/nsIDOMHTMLBRElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(7eefd466-7c4d-499a-a076-e33204e69dc3)]
+[scriptable, uuid(595249b7-c889-4e3b-9bc2-a309cab26319)]
interface nsIDOMHTMLBRElement : nsIDOMHTMLElement
{
attribute DOMString clear;
View
2  dom/interfaces/html/nsIDOMHTMLBaseElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(e55cd224-b603-4976-892a-20b11d469394)]
+[scriptable, uuid(9b845be3-5097-42ec-a3d1-a4082dd7ad8d)]
interface nsIDOMHTMLBaseElement : nsIDOMHTMLElement
{
attribute DOMString href;
View
2  dom/interfaces/html/nsIDOMHTMLBodyElement.idl
@@ -54,7 +54,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(6c377d44-a5d1-4f0f-860a-9858d2cb5679)]
+[scriptable, uuid(fbc08701-776e-47d8-8b14-12b27aadc180)]
interface nsIDOMHTMLBodyElement : nsIDOMHTMLElement
{
attribute DOMString aLink;
View
2  dom/interfaces/html/nsIDOMHTMLButtonElement.idl
@@ -52,7 +52,7 @@
interface nsIDOMValidityState;
-[scriptable, uuid(79f034f0-5c13-4101-9598-412e1eac1986)]
+[scriptable, uuid(1de3c266-5dc3-4438-8537-379879bfa425)]
interface nsIDOMHTMLButtonElement : nsIDOMHTMLElement
{
attribute boolean autofocus;
View
2  dom/interfaces/html/nsIDOMHTMLCanvasElement.idl
@@ -55,7 +55,7 @@
interface nsIDOMFile;
interface nsIVariant;
-[scriptable, uuid(dbbeeba1-3c20-4d9d-ac82-98b69fd819a9)]
+[scriptable, uuid(8cddbc86-f384-40ac-835b-fe3e00630cad)]
interface nsIDOMHTMLCanvasElement : nsIDOMHTMLElement
{
attribute unsigned long width;
View
2  dom/interfaces/html/nsIDOMHTMLCommandElement.idl
@@ -46,7 +46,7 @@
* @status UNDER_DEVELOPMENT
*/
-[scriptable, uuid(13032f74-4150-4768-ab5e-51f4de39a300)]
+[scriptable, uuid(cd779d00-7b8a-4c2c-baeb-45c09d9b6728)]
interface nsIDOMHTMLCommandElement : nsIDOMHTMLElement
{
attribute DOMString type;
View
2  dom/interfaces/html/nsIDOMHTMLDListElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(50e9ff30-0982-4074-bc65-313f41be8624)]
+[scriptable, uuid(be500158-e7b4-468e-8a02-9cb5b699dfc3)]
interface nsIDOMHTMLDListElement : nsIDOMHTMLElement
{
attribute boolean compact;
View
2  dom/interfaces/html/nsIDOMHTMLDataListElement.idl
@@ -49,7 +49,7 @@
interface nsIDOMHTMLCollection;
-[scriptable, uuid(3bace78b-9eca-4990-a5d6-9c2b8c32cc8a)]
+[scriptable, uuid(e81861c0-8522-4e5b-8d3c-869cce3db4b9)]
interface nsIDOMHTMLDataListElement : nsIDOMHTMLElement
{
readonly attribute nsIDOMHTMLCollection options;
View
2  dom/interfaces/html/nsIDOMHTMLDirectoryElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(a99e86ae-7761-4145-b8a4-5a91186051f1)]
+[scriptable, uuid(296eb015-904f-456c-a55c-ac7c828536a4)]
interface nsIDOMHTMLDirectoryElement : nsIDOMHTMLElement
{
attribute boolean compact;
View
2  dom/interfaces/html/nsIDOMHTMLDivElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(6815b902-8e04-49dd-977b-0a8785e5ffaf)]
+[scriptable, uuid(37ac66bd-a7ba-4280-93bb-889f1f94494b)]
interface nsIDOMHTMLDivElement : nsIDOMHTMLElement
{
attribute DOMString align;
View
2  dom/interfaces/html/nsIDOMHTMLElement.idl
@@ -53,7 +53,7 @@ interface nsIDOMHTMLMenuElement;
* with changes from the work-in-progress WHATWG HTML specification:
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(4eccf8a3-8bf5-43f3-a728-f5b632f7db3a)]
+[scriptable, uuid(3de9f8c1-5d76-4d2e-b6b9-334c6eb0c113)]
interface nsIDOMHTMLElement : nsIDOMElement
{
// metadata attributes
View
2  dom/interfaces/html/nsIDOMHTMLEmbedElement.idl
@@ -47,7 +47,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/#the-embed-element
*/
-[scriptable, uuid(940a15c2-0d48-4186-b4d8-067fa1ce5675)]
+[scriptable, uuid(8e3d4e85-27e8-4ba1-b837-248a01a60002)]
interface nsIDOMHTMLEmbedElement : nsIDOMHTMLElement
{
attribute DOMString align;
View
2  dom/interfaces/html/nsIDOMHTMLFieldSetElement.idl
@@ -52,7 +52,7 @@
interface nsIDOMValidityState;
-[scriptable, uuid(781ae103-b030-4aad-b2d5-96e5c2317dec)]
+[scriptable, uuid(91f19c37-4763-4963-a38a-ce3101fd3729)]
interface nsIDOMHTMLFieldSetElement : nsIDOMHTMLElement
{
attribute boolean disabled;
View
2  dom/interfaces/html/nsIDOMHTMLFontElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(1c9778ee-a49c-40ee-9b93-c0ff15630431)]
+[scriptable, uuid(e044a106-3f5c-44d6-a49a-a0a0b8eb1b56)]
interface nsIDOMHTMLFontElement : nsIDOMHTMLElement
{
attribute DOMString color;
View
2  dom/interfaces/html/nsIDOMHTMLFormElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(d873b251-6f96-4e70-baf5-aaa935aabe59)]
+[scriptable, uuid(b0fa651a-134c-4b20-ba4d-35b956a4fc50)]
interface nsIDOMHTMLFormElement : nsIDOMHTMLElement
{
attribute DOMString acceptCharset;
View
2  dom/interfaces/html/nsIDOMHTMLFrameElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(318fdc4a-3fca-4099-94aa-c9a1c30ca2b9)]
+[scriptable, uuid(4b529afd-ada8-4a2c-a70b-a4e2ead2329d)]
interface nsIDOMHTMLFrameElement : nsIDOMHTMLElement
{
attribute DOMString frameBorder;
View
2  dom/interfaces/html/nsIDOMHTMLFrameSetElement.idl
@@ -54,7 +54,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(6eefbe6d-182c-42e9-9850-af1892b6f2e4)]
+[scriptable, uuid(7df308ed-97bc-4646-b827-c74ba98c3132)]
interface nsIDOMHTMLFrameSetElement : nsIDOMHTMLElement
{
attribute DOMString cols;
View
2  dom/interfaces/html/nsIDOMHTMLHRElement.idl
@@ -51,7 +51,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(b94bff8f-dfa7-4dd8-8d97-c301dd9de729)]
+[scriptable, uuid(cc4919f4-3123-4e03-a49c-82abaad84f2f)]
interface nsIDOMHTMLHRElement : nsIDOMHTMLElement
{
attribute DOMString align;
View
2  dom/interfaces/html/nsIDOMHTMLHeadElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(628fe597-6408-4387-9fcb-75381e2b2dd0)]
+[scriptable, uuid(dcffcf96-c4be-4c4d-a8db-05ca19212053)]
interface nsIDOMHTMLHeadElement : nsIDOMHTMLElement
{
};
View
2  dom/interfaces/html/nsIDOMHTMLHeadingElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(964c94b0-5571-44e7-9b29-f81c6ea7828a)]
+[scriptable, uuid(bf25942d-acb2-4a88-87b3-ebd498a60158)]
interface nsIDOMHTMLHeadingElement : nsIDOMHTMLElement
{
attribute DOMString align;
View
2  dom/interfaces/html/nsIDOMHTMLHtmlElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(4bafbc15-aa88-4021-9ad6-e14189b7227b)]
+[scriptable, uuid(11064dea-f7bb-4e92-88a9-54a5cacb9bb8)]
interface nsIDOMHTMLHtmlElement : nsIDOMHTMLElement
{
attribute DOMString version;
View
2  dom/interfaces/html/nsIDOMHTMLIFrameElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(5ef30718-fe45-43a2-a478-a9e3cbf3a118)]
+[scriptable, uuid(d4e870bd-452c-4860-b93c-f4ee00ba33f6)]
interface nsIDOMHTMLIFrameElement : nsIDOMHTMLElement
{
attribute DOMString align;
View
2  dom/interfaces/html/nsIDOMHTMLImageElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(56d9191f-5a94-432f-af70-6fccdeaf614b)]
+[scriptable, uuid(3ed7023f-24be-4cd6-984c-c182a6b67bf9)]
interface nsIDOMHTMLImageElement : nsIDOMHTMLElement
{
attribute DOMString alt;
View
2  dom/interfaces/html/nsIDOMHTMLInputElement.idl
@@ -54,7 +54,7 @@ interface nsIDOMValidityState;
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(7330cd35-c930-4f45-ae61-f5380c30222d)]
+[scriptable, uuid(6b1175a5-70dd-4c26-be99-9e780c32550d)]
interface nsIDOMHTMLInputElement : nsIDOMHTMLElement
{
attribute DOMString accept;
View
2  dom/interfaces/html/nsIDOMHTMLLIElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(85b15d13-be6d-4653-9c70-22a13d510247)]
+[scriptable, uuid(681be589-da8b-4bf9-a7e0-6f29a5ac91bb)]
interface nsIDOMHTMLLIElement : nsIDOMHTMLElement
{
attribute DOMString type;
View
2  dom/interfaces/html/nsIDOMHTMLLabelElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(ddbca449-625d-467c-a22d-7887474f9eb9)]
+[scriptable, uuid(9f176054-6e79-4235-b4b9-061beddb4ac4)]
interface nsIDOMHTMLLabelElement : nsIDOMHTMLElement
{
readonly attribute nsIDOMHTMLFormElement form;
View
2  dom/interfaces/html/nsIDOMHTMLLegendElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(dac72753-6919-414b-b771-9e1e86e7749c)]
+[scriptable, uuid(0482fb35-dba0-4675-bf7b-aed33b575f38)]
interface nsIDOMHTMLLegendElement : nsIDOMHTMLElement
{
readonly attribute nsIDOMHTMLFormElement form;
View
2  dom/interfaces/html/nsIDOMHTMLLinkElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(2ece79f4-83d7-499c-946f-ae9ab93147b7)]
+[scriptable, uuid(0c8d524d-d3fc-44dd-8f6a-59069e33ded4)]
interface nsIDOMHTMLLinkElement : nsIDOMHTMLElement
{
attribute boolean disabled;
View
2  dom/interfaces/html/nsIDOMHTMLMapElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(c919bc49-bd49-4b89-ba70-5c74c4ef504a)]
+[scriptable, uuid(b99c31bc-76d0-43bc-a912-f839ec89c829)]
interface nsIDOMHTMLMapElement : nsIDOMHTMLElement
{
readonly attribute nsIDOMHTMLCollection areas;
View
2  dom/interfaces/html/nsIDOMHTMLMediaElement.idl
@@ -57,7 +57,7 @@
#endif
%}
-[scriptable, uuid(ecba7c11-7f60-4b0a-b57b-6f4d973305a4)]
+[scriptable, uuid(6733a409-fab3-45e1-af23-9af8c361bdfd)]
interface nsIDOMHTMLMediaElement : nsIDOMHTMLElement
{
// error state
View
2  dom/interfaces/html/nsIDOMHTMLMenuElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(06d48250-45e0-4f26-9a07-d9b5a3f08bb6)]
+[scriptable, uuid(321392c8-9eb1-47db-a41c-5dc466949e8a)]
interface nsIDOMHTMLMenuElement : nsIDOMHTMLElement
{
attribute boolean compact;
View
2  dom/interfaces/html/nsIDOMHTMLMenuItemElement.idl
@@ -43,7 +43,7 @@
* @status UNDER_DEVELOPMENT
*/
-[scriptable, uuid(4680ec24-94f0-4eb7-9413-98f9a857de72)]
+[scriptable, uuid(66a84ce5-2346-42ca-b6e4-7cc8ec9e621d)]
interface nsIDOMHTMLMenuItemElement : nsIDOMHTMLCommandElement
{
};
View
2  dom/interfaces/html/nsIDOMHTMLMetaElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(db476657-5f59-4e29-84a6-50afe6f85ac7)]
+[scriptable, uuid(1817a7fa-6f13-44f8-8a45-7f8f1fe7c252)]
interface nsIDOMHTMLMetaElement : nsIDOMHTMLElement
{
attribute DOMString content;
View
2  dom/interfaces/html/nsIDOMHTMLModElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(170733d4-aad5-4f6e-86c0-94845ea6116d)]
+[scriptable, uuid(40552a5e-7fea-42cb-b65d-4d8c0827d03c)]
interface nsIDOMHTMLModElement : nsIDOMHTMLElement
{
attribute DOMString cite;
View
2  dom/interfaces/html/nsIDOMHTMLOListElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(31a5f083-59a6-41c3-8a0b-e58e484c6516)]
+[scriptable, uuid(08a25a61-f2a3-4eff-b208-ad05805e62e7)]
interface nsIDOMHTMLOListElement : nsIDOMHTMLElement
{
attribute boolean compact;
View
2  dom/interfaces/html/nsIDOMHTMLObjectElement.idl
@@ -52,7 +52,7 @@
interface nsIDOMValidityState;
-[scriptable, uuid(40037f4a-5bae-476f-977b-bbd8e78aaefe)]
+[scriptable, uuid(dbb14d7b-05ce-4abd-a980-9aedede612af)]
interface nsIDOMHTMLObjectElement : nsIDOMHTMLElement
{
readonly attribute nsIDOMHTMLFormElement form;
View
2  dom/interfaces/html/nsIDOMHTMLOptGroupElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(ab55d67a-aabb-4441-b182-8ff2bd7d157e)]
+[scriptable, uuid(45685a23-a6c0-48d3-83f9-7b3bba1bd995)]
interface nsIDOMHTMLOptGroupElement : nsIDOMHTMLElement
{
attribute boolean disabled;
View
2  dom/interfaces/html/nsIDOMHTMLOptionElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(7c5bf0ac-6230-4ee0-8b82-e7ebf211af03)]
+[scriptable, uuid(ec3cfb59-a945-4821-8ea6-2448970e7639)]
interface nsIDOMHTMLOptionElement : nsIDOMHTMLElement
{
attribute boolean disabled;
View
2  dom/interfaces/html/nsIDOMHTMLOutputElement.idl
@@ -50,7 +50,7 @@
interface nsIDOMDOMSettableTokenList;
interface nsIDOMValidityState;
-[scriptable, uuid(f2074cdb-19cb-447a-935c-9f4402dc1b5e)]
+[scriptable, uuid(8f321988-6fe2-4714-8ba9-12c819fea2ed)]
interface nsIDOMHTMLOutputElement : nsIDOMHTMLElement
{
readonly attribute nsIDOMDOMSettableTokenList htmlFor;
View
2  dom/interfaces/html/nsIDOMHTMLParagraphElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(e4f498f4-e3c5-46fe-92d0-c9957ccab530)]
+[scriptable, uuid(5874cbcf-8a14-49d6-ac5f-52d3dc6df529)]
interface nsIDOMHTMLParagraphElement : nsIDOMHTMLElement
{
attribute DOMString align;
View
2  dom/interfaces/html/nsIDOMHTMLParamElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(d832b1ac-9bb6-4df0-9d9e-f7c040759672)]
+[scriptable, uuid(1f0685fb-bf49-4c39-b08d-7d75b1e5e493)]
interface nsIDOMHTMLParamElement : nsIDOMHTMLElement
{
attribute DOMString name;
View
2  dom/interfaces/html/nsIDOMHTMLPreElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(f4088dff-649c-4eff-a3a4-dbd6333cdc44)]
+[scriptable, uuid(1b24b515-7227-40dc-ad53-ad2a55d281d4)]
interface nsIDOMHTMLPreElement : nsIDOMHTMLElement
{
attribute long width;
View
2  dom/interfaces/html/nsIDOMHTMLProgressElement.idl
@@ -47,7 +47,7 @@
* @status UNDER_DEVELOPMENT
*/
-[scriptable, uuid(9b1d2263-b60f-4d18-b4d1-66e8c3867c79)]
+[scriptable, uuid(d74f904b-d3cd-47c3-a863-753fe22c19ab)]
interface nsIDOMHTMLProgressElement : nsIDOMHTMLElement
{
attribute double value;
View
2  dom/interfaces/html/nsIDOMHTMLQuoteElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(55643647-2eda-4a45-af55-b2ba6c40c5f5)]
+[scriptable, uuid(9b20c533-a94f-4644-9763-1f414ebbe9b1)]
interface nsIDOMHTMLQuoteElement : nsIDOMHTMLElement
{
attribute DOMString cite;
View
2  dom/interfaces/html/nsIDOMHTMLScriptElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(4b6a0957-5466-4134-8a0a-dd7e4675c106)]
+[scriptable, uuid(8b79bf24-d127-4b63-a798-f44bee76204d)]
interface nsIDOMHTMLScriptElement : nsIDOMHTMLElement
{
attribute DOMString src;
View
2  dom/interfaces/html/nsIDOMHTMLSelectElement.idl
@@ -53,7 +53,7 @@
interface nsIDOMValidityState;
-[scriptable, uuid(98f111e0-2b7e-4abd-984b-2cc1d174fe44)]
+[scriptable, uuid(6f0a4fee-3aea-4bb7-85cb-d4881a55ca43)]
interface nsIDOMHTMLSelectElement : nsIDOMHTMLElement
{
attribute boolean autofocus;
View
2  dom/interfaces/html/nsIDOMHTMLSourceElement.idl
@@ -48,7 +48,7 @@
* @status UNDER_DEVELOPMENT
*/
-[scriptable, uuid(c49d9a78-fa02-49c9-b239-9cd51e99f866)]
+[scriptable, uuid(df8ecfef-92e5-419e-81d4-900a7cf3c3c3)]
interface nsIDOMHTMLSourceElement : nsIDOMHTMLElement
{
attribute DOMString src;
View
2  dom/interfaces/html/nsIDOMHTMLStyleElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(247fc8c4-92f3-427b-af6f-41b13f28287d)]
+[scriptable, uuid(04c29aaa-2239-42a9-ade0-0ba3134c1a8e)]
interface nsIDOMHTMLStyleElement : nsIDOMHTMLElement
{
attribute boolean disabled;
View
2  dom/interfaces/html/nsIDOMHTMLTableCaptionElem.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(db0e641f-ba2b-4c67-8da1-4e418cc5fbf7)]
+[scriptable, uuid(22cfd967-a21d-4bed-a759-0928ff4dfcd0)]
interface nsIDOMHTMLTableCaptionElement : nsIDOMHTMLElement
{
attribute DOMString align;
View
2  dom/interfaces/html/nsIDOMHTMLTableCellElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(4caa7af0-fec4-44c1-9a81-e1f14166e60c)]
+[scriptable, uuid(61bf360a-a6b7-4928-96de-b54742f8b4b8)]
interface nsIDOMHTMLTableCellElement : nsIDOMHTMLElement
{
readonly attribute long cellIndex;
View
2  dom/interfaces/html/nsIDOMHTMLTableColElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(9a4d1f6a-fb19-4886-b0d8-dcd201566580)]
+[scriptable, uuid(d933a77b-35f3-41ec-b73f-8ae80bb7cf73)]
interface nsIDOMHTMLTableColElement : nsIDOMHTMLElement
{
attribute DOMString align;
View
2  dom/interfaces/html/nsIDOMHTMLTableElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(0f809b97-9311-45c4-a44e-7145f354438b)]
+[scriptable, uuid(7b9d43a6-7e9e-4618-970b-29eb3547d506)]
interface nsIDOMHTMLTableElement : nsIDOMHTMLElement
{
// Modified in DOM Level 2:
View
2  dom/interfaces/html/nsIDOMHTMLTableRowElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(d24a80d4-491d-4e36-9349-afd3c6999b3e)]
+[scriptable, uuid(f76a1d42-25b9-41b9-a58e-7d934e1be0a2)]
interface nsIDOMHTMLTableRowElement : nsIDOMHTMLElement
{
// Modified in DOM Level 2:
View
2  dom/interfaces/html/nsIDOMHTMLTableSectionElem.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(6acc106e-96a2-4519-8f3a-142ebbdc1bb1)]
+[scriptable, uuid(4940c93c-b83e-4101-b9de-c33139cc5a3a)]
interface nsIDOMHTMLTableSectionElement : nsIDOMHTMLElement
{
attribute DOMString align;
View
2  dom/interfaces/html/nsIDOMHTMLTextAreaElement.idl
@@ -53,7 +53,7 @@ interface nsIDOMValidityState;
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(16db703d-4816-440c-bcb3-c1ae0cae6532)]
+[scriptable, uuid(0ad0571c-f8ba-44e2-b5aa-5e1c93fae7c0)]
interface nsIDOMHTMLTextAreaElement : nsIDOMHTMLElement
{
attribute boolean autofocus;
View
2  dom/interfaces/html/nsIDOMHTMLTitleElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(e20fd651-6240-4f20-b8f0-6cc25cb699b7)]
+[scriptable, uuid(c569199b-328a-433d-8d40-fe858988625e)]
interface nsIDOMHTMLTitleElement : nsIDOMHTMLElement
{
attribute DOMString text;
View
2  dom/interfaces/html/nsIDOMHTMLUListElement.idl
@@ -50,7 +50,7 @@
* http://www.whatwg.org/specs/web-apps/current-work/
*/
-[scriptable, uuid(2467d39c-2c30-407e-9b67-ea5f231b7809)]
+[scriptable, uuid(e9bec981-dd3e-4849-85b9-2f4f30ba5152)]
interface nsIDOMHTMLUListElement : nsIDOMHTMLElement
{
attribute boolean compact;
View
2  dom/interfaces/html/nsIDOMHTMLUnknownElement.idl
@@ -43,7 +43,7 @@
*
* @see <http://www.whatwg.org/html/#htmlunknownelement>
*/
-[scriptable, uuid(5f922c13-c2c1-4c49-b7c2-0e4e5c8e6860)]
+[scriptable, uuid(50c480fa-d3dc-49ad-a21d-d4d5f7aec44e)]
interface nsIDOMHTMLUnknownElement : nsIDOMHTMLElement
{
};
View
2  dom/interfaces/html/nsIDOMHTMLVideoElement.idl
@@ -48,7 +48,7 @@
* @status UNDER_DEVELOPMENT
*/
-[scriptable, uuid(9f13f05e-42a0-40d2-930c-c407887710cc)]
+[scriptable, uuid(2274055b-8b3a-4a5a-8d72-5d5aea07021a)]
interface nsIDOMHTMLVideoElement : nsIDOMHTMLMediaElement
{
attribute long width;
View
2  dom/interfaces/svg/nsIDOMSVGAElement.idl
@@ -44,7 +44,7 @@
interface nsIDOMSVGAnimatedString;
-[scriptable, uuid(f1b259b6-587c-46fe-8800-2f0156fe04e8)]
+[scriptable, uuid(0e0081ce-8b9d-4c26-baeb-a5e99f5126f9)]
interface nsIDOMSVGAElement
: nsIDOMSVGElement
/*
View
2  dom/interfaces/svg/nsIDOMSVGAltGlyphElement.idl
@@ -35,7 +35,7 @@
#include "nsIDOMSVGTextPositionElem.idl"
-[scriptable, uuid(a1491d59-8e4e-4ed9-aa1b-c599bd01173a)]
+[scriptable, uuid(e86efca6-0391-4e9a-83dc-90b3b761a690)]
interface nsIDOMSVGAltGlyphElement : nsIDOMSVGTextPositioningElement
/*
The SVG DOM makes use of multiple interface inheritance.
View
2  dom/interfaces/svg/nsIDOMSVGAnimateElement.idl
@@ -37,5 +37,5 @@
#include "nsIDOMSVGAnimationElement.idl"
-[scriptable, uuid(3a2ef7b7-5687-40ab-b607-6f84ea9728cc)]
+[scriptable, uuid(01a99850-013b-4821-97fd-798732c8cc53)]
interface nsIDOMSVGAnimateElement : nsIDOMSVGAnimationElement {};
View
2  dom/interfaces/svg/nsIDOMSVGAnimateMotionElement.idl
@@ -37,5 +37,5 @@
#include "nsIDOMSVGAnimationElement.idl"
-[scriptable, uuid(e847ef4c-0c4e-417a-b5e2-7e22dc42a233)]
+[scriptable, uuid(29d02159-1517-49dc-8a83-8824fb166c09)]
interface nsIDOMSVGAnimateMotionElement : nsIDOMSVGAnimationElement { };
View
2  dom/interfaces/svg/nsIDOMSVGAnimateTransformElement.idl
@@ -37,5 +37,5 @@
#include "nsIDOMSVGAnimationElement.idl"
-[scriptable, uuid(0967287a-97a0-4926-936c-1749f1e67a68)]
+[scriptable, uuid(62e30f49-3566-4415-8971-b0ddd2c8bf97)]
interface nsIDOMSVGAnimateTransformElement : nsIDOMSVGAnimationElement {};
View
2  dom/interfaces/svg/nsIDOMSVGAnimationElement.idl
@@ -37,7 +37,7 @@
#include "nsIDOMSVGElement.idl"
-[scriptable, uuid(91183127-a2a5-43ee-a9ce-737a4d25e65e)]
+[scriptable, uuid(412616f5-b7a0-4160-9c64-5c328cb73836)]
interface nsIDOMSVGAnimationElement
: nsIDOMSVGElement
/*
View
2  dom/interfaces/svg/nsIDOMSVGCircleElement.idl
@@ -40,7 +40,7 @@
interface nsIDOMSVGAnimatedLength;
-[scriptable, uuid(5d80ae99-417a-4454-96bd-3a9a2b03eee9)]
+[scriptable, uuid(9c3e3e1f-0332-4b6c-8699-554edb3a972f)]
interface nsIDOMSVGCircleElement
: nsIDOMSVGElement
/*
View
2  dom/interfaces/svg/nsIDOMSVGClipPathElement.idl
@@ -47,7 +47,7 @@
interface nsIDOMSVGAnimatedEnumeration;
-[scriptable, uuid(860d3dbd-c59e-446c-85b5-2b534ad70308)]
+[scriptable, uuid(384359ad-7c3f-4638-9364-95e4d42b4c0c)]
interface nsIDOMSVGClipPathElement
: nsIDOMSVGElement
/*
View
2  dom/interfaces/svg/nsIDOMSVGDefsElement.idl
@@ -38,7 +38,7 @@
#include "nsIDOMSVGElement.idl"
-[scriptable, uuid(db31fc68-8b12-46be-86d3-6a8c2acc5798)]
+[scriptable, uuid(e6dd64f2-c59b-4c0f-85fb-63b748c20057)]
interface nsIDOMSVGDefsElement
: nsIDOMSVGElement
/*
View
2  dom/interfaces/svg/nsIDOMSVGDescElement.idl
@@ -38,7 +38,7 @@
#include "nsIDOMSVGElement.idl"
-[scriptable, uuid(38c2cf34-1eb1-4cd9-ad5e-b9caae9e6b28)]
+[scriptable, uuid(e97484c1-5b32-4e7e-8ad6-e04ea8100d3f)]
interface nsIDOMSVGDescElement
: nsIDOMSVGElement
/*
View
2  dom/interfaces/svg/nsIDOMSVGElement.idl
@@ -40,7 +40,7 @@
interface nsIDOMSVGSVGElement;
-[scriptable, uuid(b0cf8ffb-92e7-46e7-870f-a01395f37336)]
+[scriptable, uuid(dbb1b49c-dce5-43fe-97ea-e249b5620aa2)]
interface nsIDOMSVGElement : nsIDOMElement
{
attribute DOMString id;
View
2  dom/interfaces/svg/nsIDOMSVGEllipseElement.idl
@@ -40,7 +40,7 @@
interface nsIDOMSVGAnimatedLength;