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

Bug 1158366: Remove nsIDOMHTML[BR|Div|Heading|TableCaption|Table|Title]Element.idl. r=ehsan

Browse Source
This commit is contained in:
Kyle Huey 2015-04-25 07:23:54 -07:00
parent 2f8cad5d81
commit bfdeeffa32
24 changed files with 31 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/html/HTMLBRElement.cpp
View File

@ -26,14 +26,8 @@ HTMLBRElement::~HTMLBRElement()
{
}
NS_IMPL_ISUPPORTS_INHERITED(HTMLBRElement, nsGenericHTMLElement,
nsIDOMHTMLBRElement)
NS_IMPL_ELEMENT_CLONE(HTMLBRElement)
NS_IMPL_STRING_ATTR(HTMLBRElement, Clear, clear)
static const nsAttrValue::EnumTable kClearTable[] = {
{ "left", NS_STYLE_CLEAR_LEFT },
{ "right", NS_STYLE_CLEAR_RIGHT },

14
dom/html/HTMLBRElement.h
View File

@ -7,25 +7,17 @@
#define mozilla_dom_HTMLBRElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLBRElement.h"
#include "nsGenericHTMLElement.h"
#include "nsGkAtoms.h"
namespace mozilla {
namespace dom {
class HTMLBRElement final : public nsGenericHTMLElement,
public nsIDOMHTMLBRElement
class HTMLBRElement final : public nsGenericHTMLElement
{
public:
explicit HTMLBRElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
// nsIDOMHTMLBRElement
NS_DECL_NSIDOMHTMLBRELEMENT
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
@ -42,6 +34,10 @@ public:
{
return SetHTMLAttr(nsGkAtoms::clear, aClear, aError);
}
void GetClear(DOMString& aClear) const
{
return GetHTMLAttr(nsGkAtoms::clear, aClear);
}
virtual JSObject* WrapNode(JSContext *aCx, JS::Handle<JSObject*> aGivenProto) override;

3
dom/html/HTMLDivElement.cpp
View File

@ -18,9 +18,6 @@ HTMLDivElement::~HTMLDivElement()
{
}
NS_IMPL_ISUPPORTS_INHERITED(HTMLDivElement, nsGenericHTMLElement,
nsIDOMHTMLDivElement)
NS_IMPL_ELEMENT_CLONE(HTMLDivElement)
JSObject*

22
dom/html/HTMLDivElement.h
View File

@ -7,13 +7,11 @@
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsIDOMHTMLDivElement.h"
namespace mozilla {
namespace dom {
class HTMLDivElement final : public nsGenericHTMLElement,
public nsIDOMHTMLDivElement
class HTMLDivElement final : public nsGenericHTMLElement
{
public:
explicit HTMLDivElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
@ -21,24 +19,6 @@ public:
{
}
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
// nsIDOMHTMLDivElement
NS_IMETHOD GetAlign(nsAString& aAlign) override
{
DOMString align;
GetAlign(align);
align.ToString(aAlign);
return NS_OK;
}
NS_IMETHOD SetAlign(const nsAString& aAlign) override
{
mozilla::ErrorResult rv;
SetAlign(aAlign, rv);
return rv.ErrorCode();
}
void GetAlign(DOMString& aAlign)
{
GetHTMLAttr(nsGkAtoms::align, aAlign);

6
dom/html/HTMLHeadingElement.cpp
View File

@ -21,9 +21,6 @@ HTMLHeadingElement::~HTMLHeadingElement()
{
}
NS_IMPL_ISUPPORTS_INHERITED(HTMLHeadingElement, nsGenericHTMLElement,
nsIDOMHTMLHeadingElement)
NS_IMPL_ELEMENT_CLONE(HTMLHeadingElement)
JSObject*
@ -32,9 +29,6 @@ HTMLHeadingElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aGivenProto)
return HTMLHeadingElementBinding::Wrap(aCx, this, aGivenProto);
}
NS_IMPL_STRING_ATTR(HTMLHeadingElement, Align, align)
bool
HTMLHeadingElement::ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,

20
dom/html/HTMLHeadingElement.h
View File

@ -7,14 +7,12 @@
#define mozilla_dom_HTMLHeadingElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLHeadingElement.h"
#include "nsGenericHTMLElement.h"
namespace mozilla {
namespace dom {
class HTMLHeadingElement final : public nsGenericHTMLElement,
public nsIDOMHTMLHeadingElement
class HTMLHeadingElement final : public nsGenericHTMLElement
{
public:
explicit HTMLHeadingElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
@ -22,12 +20,6 @@ public:
{
}
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
// nsIDOMHTMLHeadingElement
NS_DECL_NSIDOMHTMLHEADINGELEMENT
virtual bool ParseAttribute(int32_t aNamespaceID,
nsIAtom* aAttribute,
const nsAString& aValue,
@ -36,8 +28,14 @@ public:
nsMapRuleToAttributesFunc GetAttributeMappingFunction() const override;
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult) const override;
// The XPCOM versions of GetAlign and SetAlign are fine for us for
// use from WebIDL.
void SetAlign(const nsAString& aAlign, ErrorResult& aError)
{
return SetHTMLAttr(nsGkAtoms::align, aAlign, aError);
}
void GetAlign(DOMString& aAlign) const
{
return GetHTMLAttr(nsGkAtoms::align, aAlign);
}
protected:
virtual ~HTMLHeadingElement();

5
dom/html/HTMLTableCaptionElement.cpp
View File

@ -24,13 +24,8 @@ HTMLTableCaptionElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aGivenPr
return HTMLTableCaptionElementBinding::Wrap(aCx, this, aGivenProto);
}
NS_IMPL_ISUPPORTS_INHERITED(HTMLTableCaptionElement, nsGenericHTMLElement,
nsIDOMHTMLTableCaptionElement)
NS_IMPL_ELEMENT_CLONE(HTMLTableCaptionElement)
NS_IMPL_STRING_ATTR(HTMLTableCaptionElement, Align, align)
static const nsAttrValue::EnumTable kCaptionAlignTable[] = {
{ "left", NS_STYLE_CAPTION_SIDE_LEFT },
{ "right", NS_STYLE_CAPTION_SIDE_RIGHT },

10
dom/html/HTMLTableCaptionElement.h
View File

@ -7,13 +7,11 @@
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsIDOMHTMLTableCaptionElem.h"
namespace mozilla {
namespace dom {
class HTMLTableCaptionElement final : public nsGenericHTMLElement,
public nsIDOMHTMLTableCaptionElement
class HTMLTableCaptionElement final : public nsGenericHTMLElement
{
public:
explicit HTMLTableCaptionElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
@ -22,12 +20,6 @@ public:
SetHasWeirdParserInsertionMode();
}
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
// nsIDOMHTMLTableCaptionElement
NS_DECL_NSIDOMHTMLTABLECAPTIONELEMENT
void GetAlign(DOMString& aAlign)
{
GetHTMLAttr(nsGkAtoms::align, aAlign);

5
dom/html/HTMLTableElement.cpp
View File

@ -326,9 +326,8 @@ NS_IMPL_ADDREF_INHERITED(HTMLTableElement, Element)
NS_IMPL_RELEASE_INHERITED(HTMLTableElement, Element)
// QueryInterface implementation for HTMLTableElement
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(HTMLTableElement)
NS_INTERFACE_TABLE_INHERITED(HTMLTableElement, nsIDOMHTMLTableElement)
NS_INTERFACE_TABLE_TAIL_INHERITING(nsGenericHTMLElement)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(HTMLTableElement)
NS_INTERFACE_MAP_END_INHERITING(nsGenericHTMLElement)
NS_IMPL_ELEMENT_CLONE(HTMLTableElement)

4
dom/html/HTMLTableElement.h
View File

@ -7,7 +7,6 @@
#include "mozilla/Attributes.h"
#include "nsGenericHTMLElement.h"
#include "nsIDOMHTMLTableElement.h"
#include "mozilla/dom/HTMLTableCaptionElement.h"
#include "mozilla/dom/HTMLTableSectionElement.h"
@ -18,8 +17,7 @@ namespace dom {
class TableRowsCollection;
class HTMLTableElement final : public nsGenericHTMLElement,
public nsIDOMHTMLTableElement
class HTMLTableElement final : public nsGenericHTMLElement
{
public:
explicit HTMLTableElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);

18
dom/html/HTMLTitleElement.cpp
View File

@ -28,7 +28,7 @@ HTMLTitleElement::~HTMLTitleElement()
}
NS_IMPL_ISUPPORTS_INHERITED(HTMLTitleElement, nsGenericHTMLElement,
nsIDOMHTMLTitleElement, nsIMutationObserver)
nsIMutationObserver)
NS_IMPL_ELEMENT_CLONE(HTMLTitleElement)
@ -38,20 +38,18 @@ HTMLTitleElement::WrapNode(JSContext* cx, JS::Handle<JSObject*> aGivenProto)
return HTMLTitleElementBinding::Wrap(cx, this, aGivenProto);
}
NS_IMETHODIMP
HTMLTitleElement::GetText(nsAString& aTitle)
void
HTMLTitleElement::GetText(DOMString& aText, ErrorResult& aError)
{
if (!nsContentUtils::GetNodeTextContent(this, false, aTitle)) {
return NS_ERROR_OUT_OF_MEMORY;
if (!nsContentUtils::GetNodeTextContent(this, false, aText)) {
aError = NS_ERROR_OUT_OF_MEMORY;
}
return NS_OK;
}
NS_IMETHODIMP
HTMLTitleElement::SetText(const nsAString& aTitle)
void
HTMLTitleElement::SetText(const nsAString& aText, ErrorResult& aError)
{
return nsContentUtils::SetNodeTextContent(this, aTitle, true);
aError = nsContentUtils::SetNodeTextContent(this, aText, true);
}
void

12
dom/html/HTMLTitleElement.h
View File

@ -7,7 +7,6 @@
#define mozilla_dom_HTMLTITLEElement_h_
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLTitleElement.h"
#include "nsGenericHTMLElement.h"
#include "nsStubMutationObserver.h"
@ -17,7 +16,6 @@ class ErrorResult;
namespace dom {
class HTMLTitleElement final : public nsGenericHTMLElement,
public nsIDOMHTMLTitleElement,
public nsStubMutationObserver
{
public:
@ -29,15 +27,9 @@ public:
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
// nsIDOMHTMLTitleElement
NS_DECL_NSIDOMHTMLTITLEELEMENT
//HTMLTitleElement
//The xpcom GetTextContent() never fails so we just use that.
void SetText(const nsAString& aText, ErrorResult& aError)
{
aError = SetText(aText);
}
void GetText(DOMString& aText, ErrorResult& aError);
void SetText(const nsAString& aText, ErrorResult& aError);
// nsIMutationObserver
NS_DECL_NSIMUTATIONOBSERVER_CHARACTERDATACHANGED

1
dom/interfaces/base/domstubs.idl
View File

@ -69,7 +69,6 @@ interface nsIDOMCounter;
interface nsIDOMRect;
interface nsIDOMCSSStyleRule;
interface nsIDOMCSSStyleRuleCollection;
interface nsIDOMHTMLTableCaptionElement;
// Range
interface nsIDOMRange;

6
dom/interfaces/html/moz.build
View File

@ -10,12 +10,10 @@ XPIDL_SOURCES += [
'nsIDOMHTMLAreaElement.idl',
'nsIDOMHTMLBaseElement.idl',
'nsIDOMHTMLBodyElement.idl',
'nsIDOMHTMLBRElement.idl',
'nsIDOMHTMLButtonElement.idl',
'nsIDOMHTMLCanvasElement.idl',
'nsIDOMHTMLCollection.idl',
'nsIDOMHTMLDirectoryElement.idl',
'nsIDOMHTMLDivElement.idl',
'nsIDOMHTMLDocument.idl',
'nsIDOMHTMLElement.idl',
'nsIDOMHTMLEmbedElement.idl',
@ -24,7 +22,6 @@ XPIDL_SOURCES += [
'nsIDOMHTMLFrameElement.idl',
'nsIDOMHTMLFrameSetElement.idl',
'nsIDOMHTMLHeadElement.idl',
'nsIDOMHTMLHeadingElement.idl',
'nsIDOMHTMLHRElement.idl',
'nsIDOMHTMLHtmlElement.idl',
'nsIDOMHTMLIFrameElement.idl',
@ -51,11 +48,8 @@ XPIDL_SOURCES += [
'nsIDOMHTMLSelectElement.idl',
'nsIDOMHTMLSourceElement.idl',
'nsIDOMHTMLStyleElement.idl',
'nsIDOMHTMLTableCaptionElem.idl',
'nsIDOMHTMLTableCellElement.idl',
'nsIDOMHTMLTableElement.idl',
'nsIDOMHTMLTextAreaElement.idl',
'nsIDOMHTMLTitleElement.idl',
'nsIDOMHTMLUListElement.idl',
'nsIDOMMediaError.idl',
'nsIDOMMozBrowserFrame.idl',

23
dom/interfaces/html/nsIDOMHTMLBRElement.idl
View File

@ -1,23 +0,0 @@
/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsIDOMHTMLElement.idl"
/**
* The nsIDOMHTMLBRElement interface is the interface to a [X]HTML br
* element.
*
* This interface is trying to follow the DOM Level 2 HTML specification:
* http://www.w3.org/TR/DOM-Level-2-HTML/
*
* with changes from the work-in-progress WHATWG HTML specification:
* http://www.whatwg.org/specs/web-apps/current-work/
*/
[uuid(ba8fb51a-e552-4272-b3df-5e63a60b86ee)]
interface nsIDOMHTMLBRElement : nsISupports
{
attribute DOMString clear;
};

23
dom/interfaces/html/nsIDOMHTMLDivElement.idl
View File

@ -1,23 +0,0 @@
/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsIDOMHTMLElement.idl"
/**
* The nsIDOMHTMLDivElement interface is the interface to a [X]HTML
* div element.
*
* This interface is trying to follow the DOM Level 2 HTML specification:
* http://www.w3.org/TR/DOM-Level-2-HTML/
*
* with changes from the work-in-progress WHATWG HTML specification:
* http://www.whatwg.org/specs/web-apps/current-work/
*/
[uuid(d1b51f44-38e0-4496-8236-b795e36df0e2)]
interface nsIDOMHTMLDivElement : nsISupports
{
attribute DOMString align;
};

23
dom/interfaces/html/nsIDOMHTMLHeadingElement.idl
View File

@ -1,23 +0,0 @@
/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsIDOMHTMLElement.idl"
/**
* The nsIDOMHTMLHeadingElement interface is the interface to a
* [X]HTML h1, h2, h3, ... element.
*
* This interface is trying to follow the DOM Level 2 HTML specification:
* http://www.w3.org/TR/DOM-Level-2-HTML/
*
* with changes from the work-in-progress WHATWG HTML specification:
* http://www.whatwg.org/specs/web-apps/current-work/
*/
[uuid(a40b92f7-9da7-4c9f-8a0c-cf5b9e28bb30)]
interface nsIDOMHTMLHeadingElement : nsISupports
{
attribute DOMString align;
};

23
dom/interfaces/html/nsIDOMHTMLTableCaptionElem.idl
View File

@ -1,23 +0,0 @@
/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsIDOMHTMLElement.idl"
/**
* The nsIDOMHTMLTableCaptionElement interface is the interface to a
* [X]HTML caption element.
*
* This interface is trying to follow the DOM Level 2 HTML specification:
* http://www.w3.org/TR/DOM-Level-2-HTML/
*
* with changes from the work-in-progress WHATWG HTML specification:
* http://www.whatwg.org/specs/web-apps/current-work/
*/
[builtinclass, uuid(78f0635b-44d2-4d5c-87de-29d54df6aed6)]
interface nsIDOMHTMLTableCaptionElement : nsISupports
{
attribute DOMString align;
};

22
dom/interfaces/html/nsIDOMHTMLTableElement.idl
View File

@ -1,22 +0,0 @@
/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsIDOMHTMLElement.idl"
/**
* The nsIDOMHTMLTableElement interface is the interface to a [X]HTML
* table element.
*
* This interface is trying to follow the DOM Level 2 HTML specification:
* http://www.w3.org/TR/DOM-Level-2-HTML/
*
* with changes from the work-in-progress WHATWG HTML specification:
* http://www.whatwg.org/specs/web-apps/current-work/
*/
[uuid(135a30ee-0374-4ee7-9d36-91736bff5fb1)]
interface nsIDOMHTMLTableElement : nsISupports
{
};

23
dom/interfaces/html/nsIDOMHTMLTitleElement.idl
View File

@ -1,23 +0,0 @@
/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsIDOMHTMLElement.idl"
/**
* The nsIDOMHTMLTitleElement interface is the interface to a [X]HTML
* title element.
*
* This interface is trying to follow the DOM Level 2 HTML specification:
* http://www.w3.org/TR/DOM-Level-2-HTML/
*
* with changes from the work-in-progress WHATWG HTML specification:
* http://www.whatwg.org/specs/web-apps/current-work/
*/
[uuid(e8e5168a-e12e-4946-9fa7-5fe0d6932198)]
interface nsIDOMHTMLTitleElement : nsISupports
{
attribute DOMString text;
};

1
dom/webidl/HTMLHeadingElement.webidl
View File

@ -17,5 +17,6 @@ interface HTMLHeadingElement : HTMLElement {
// http://www.whatwg.org/specs/web-apps/current-work/#other-elements,-attributes-and-apis
partial interface HTMLHeadingElement {
[SetterThrows]
attribute DOMString align;
};

2
dom/webidl/HTMLTitleElement.webidl
View File

@ -8,6 +8,6 @@
*/
interface HTMLTitleElement : HTMLElement {
[SetterThrows]
[Throws]
attribute DOMString text;
};

1
extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
View File

@ -12,7 +12,6 @@
#include "nsIDOMRange.h"
#include "nsIEditor.h"
#include "nsIDOMNode.h"
#include "nsIDOMHTMLBRElement.h"
#include "nsUnicharUtilCIID.h"
#include "nsUnicodeProperties.h"
#include "nsServiceManagerUtils.h"

18
xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp
View File

@ -53,14 +53,12 @@
#include "nsIDOMHTMLAnchorElement.h"
#include "nsIDOMHTMLAppletElement.h"
#include "nsIDOMHTMLAreaElement.h"
#include "nsIDOMHTMLBRElement.h"
#include "nsIDOMHTMLBaseElement.h"
#include "nsIDOMHTMLBodyElement.h"
#include "nsIDOMHTMLButtonElement.h"
#include "nsIDOMHTMLCanvasElement.h"
#include "nsIDOMHTMLCollection.h"
#include "nsIDOMHTMLDirectoryElement.h"
#include "nsIDOMHTMLDivElement.h"
#include "nsIDOMHTMLDocument.h"
#include "nsIDOMHTMLElement.h"
#include "nsIDOMHTMLEmbedElement.h"
@ -70,7 +68,6 @@
#include "nsIDOMHTMLFrameSetElement.h"
#include "nsIDOMHTMLHRElement.h"
#include "nsIDOMHTMLHeadElement.h"
#include "nsIDOMHTMLHeadingElement.h"
#include "nsIDOMHTMLHtmlElement.h"
#include "nsIDOMHTMLIFrameElement.h"
#include "nsIDOMHTMLImageElement.h"
@ -95,11 +92,8 @@
#include "nsIDOMHTMLSelectElement.h"
#include "nsIDOMHTMLSourceElement.h"
#include "nsIDOMHTMLStyleElement.h"
#include "nsIDOMHTMLTableCaptionElem.h"
#include "nsIDOMHTMLTableCellElement.h"
#include "nsIDOMHTMLTableElement.h"
#include "nsIDOMHTMLTextAreaElement.h"
#include "nsIDOMHTMLTitleElement.h"
#include "nsIDOMHTMLUListElement.h"
#include "nsIDOMKeyEvent.h"
#include "nsIDOMMediaError.h"
@ -193,14 +187,12 @@
#include "mozilla/dom/HTMLAnchorElementBinding.h"
#include "mozilla/dom/HTMLAppletElementBinding.h"
#include "mozilla/dom/HTMLAreaElementBinding.h"
#include "mozilla/dom/HTMLBRElementBinding.h"
#include "mozilla/dom/HTMLBaseElementBinding.h"
#include "mozilla/dom/HTMLBodyElementBinding.h"
#include "mozilla/dom/HTMLButtonElementBinding.h"
#include "mozilla/dom/HTMLCanvasElementBinding.h"
#include "mozilla/dom/HTMLCollectionBinding.h"
#include "mozilla/dom/HTMLDirectoryElementBinding.h"
#include "mozilla/dom/HTMLDivElementBinding.h"
#include "mozilla/dom/HTMLDocumentBinding.h"
#include "mozilla/dom/HTMLElementBinding.h"
#include "mozilla/dom/HTMLEmbedElementBinding.h"
@ -210,7 +202,6 @@
#include "mozilla/dom/HTMLFrameSetElementBinding.h"
#include "mozilla/dom/HTMLHRElementBinding.h"
#include "mozilla/dom/HTMLHeadElementBinding.h"
#include "mozilla/dom/HTMLHeadingElementBinding.h"
#include "mozilla/dom/HTMLHtmlElementBinding.h"
#include "mozilla/dom/HTMLIFrameElementBinding.h"
#include "mozilla/dom/HTMLImageElementBinding.h"
@ -235,11 +226,8 @@
#include "mozilla/dom/HTMLSelectElementBinding.h"
#include "mozilla/dom/HTMLSourceElementBinding.h"
#include "mozilla/dom/HTMLStyleElementBinding.h"
#include "mozilla/dom/HTMLTableCaptionElementBinding.h"
#include "mozilla/dom/HTMLTableCellElementBinding.h"
#include "mozilla/dom/HTMLTableElementBinding.h"
#include "mozilla/dom/HTMLTextAreaElementBinding.h"
#include "mozilla/dom/HTMLTitleElementBinding.h"
#include "mozilla/dom/HTMLUListElementBinding.h"
#include "mozilla/dom/KeyEventBinding.h"
#include "mozilla/dom/ListBoxObjectBinding.h"
@ -386,14 +374,12 @@ const ComponentsInterfaceShimEntry kComponentsInterfaceShimMap[] =
DEFINE_SHIM(HTMLAnchorElement),
DEFINE_SHIM(HTMLAppletElement),
DEFINE_SHIM(HTMLAreaElement),
DEFINE_SHIM(HTMLBRElement),
DEFINE_SHIM(HTMLBaseElement),
DEFINE_SHIM(HTMLBodyElement),
DEFINE_SHIM(HTMLButtonElement),
DEFINE_SHIM(HTMLCanvasElement),
DEFINE_SHIM(HTMLCollection),
DEFINE_SHIM(HTMLDirectoryElement),
DEFINE_SHIM(HTMLDivElement),
DEFINE_SHIM(HTMLDocument),
DEFINE_SHIM(HTMLElement),
DEFINE_SHIM(HTMLEmbedElement),
@ -403,7 +389,6 @@ const ComponentsInterfaceShimEntry kComponentsInterfaceShimMap[] =
DEFINE_SHIM(HTMLFrameSetElement),
DEFINE_SHIM(HTMLHRElement),
DEFINE_SHIM(HTMLHeadElement),
DEFINE_SHIM(HTMLHeadingElement),
DEFINE_SHIM(HTMLHtmlElement),
DEFINE_SHIM(HTMLIFrameElement),
DEFINE_SHIM(HTMLImageElement),
@ -428,11 +413,8 @@ const ComponentsInterfaceShimEntry kComponentsInterfaceShimMap[] =
DEFINE_SHIM(HTMLSelectElement),
DEFINE_SHIM(HTMLSourceElement),
DEFINE_SHIM(HTMLStyleElement),
DEFINE_SHIM(HTMLTableCaptionElement),
DEFINE_SHIM(HTMLTableCellElement),
DEFINE_SHIM(HTMLTableElement),
DEFINE_SHIM(HTMLTextAreaElement),
DEFINE_SHIM(HTMLTitleElement),
DEFINE_SHIM(HTMLUListElement),
DEFINE_SHIM(KeyEvent),
DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIListBoxObject, ListBoxObject),