Bug 1404079 - Remove nsIDOMHTMLFrameElement; r=bz

MozReview-Commit-ID: GSvMwRpl7g4
This commit is contained in:
Kyle Machulis
2017-09-28 19:06:14 -07:00
parent ba3f96fa68
commit ec8a7dce22
12 changed files with 41 additions and 85 deletions

View File

@@ -8,15 +8,13 @@
#define mozilla_dom_HTMLFrameElement_h
#include "mozilla/Attributes.h"
#include "nsIDOMHTMLFrameElement.h"
#include "nsGenericHTMLFrameElement.h"
#include "nsGkAtoms.h"
namespace mozilla {
namespace dom {
class HTMLFrameElement final : public nsGenericHTMLFrameElement,
public nsIDOMHTMLFrameElement
class HTMLFrameElement final : public nsGenericHTMLFrameElement
{
public:
using nsGenericHTMLFrameElement::SwapFrameLoaders;
@@ -27,8 +25,7 @@ public:
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
// nsIDOMHTMLFrameElement
NS_DECL_NSIDOMHTMLFRAMEELEMENT
NS_IMPL_FROMCONTENT_HTML_WITH_TAG(HTMLFrameElement, frame)
// nsIContent
virtual bool ParseAttribute(int32_t aNamespaceID,
@@ -39,31 +36,46 @@ public:
bool aPreallocateChildren) const override;
// WebIDL API
// The XPCOM GetFrameBorder is OK for us
void GetFrameBorder(DOMString& aFrameBorder) const
{
GetHTMLAttr(nsGkAtoms::frameborder, aFrameBorder);
}
void SetFrameBorder(const nsAString& aFrameBorder, ErrorResult& aError)
{
SetHTMLAttr(nsGkAtoms::frameborder, aFrameBorder, aError);
}
// The XPCOM GetLongDesc is OK for us
void GetLongDesc(nsAString& aLongDesc) const
{
GetURIAttr(nsGkAtoms::longdesc, nullptr, aLongDesc);
}
void SetLongDesc(const nsAString& aLongDesc, ErrorResult& aError)
{
SetAttrHelper(nsGkAtoms::longdesc, aLongDesc);
}
// The XPCOM GetMarginHeight is OK for us
void GetMarginHeight(DOMString& aMarginHeight) const
{
GetHTMLAttr(nsGkAtoms::marginheight, aMarginHeight);
}
void SetMarginHeight(const nsAString& aMarginHeight, ErrorResult& aError)
{
SetHTMLAttr(nsGkAtoms::marginheight, aMarginHeight, aError);
}
// The XPCOM GetMarginWidth is OK for us
void GetMarginWidth(DOMString& aMarginWidth) const
{
GetHTMLAttr(nsGkAtoms::marginwidth, aMarginWidth);
}
void SetMarginWidth(const nsAString& aMarginWidth, ErrorResult& aError)
{
SetHTMLAttr(nsGkAtoms::marginwidth, aMarginWidth, aError);
}
// The XPCOM GetName is OK for us
void GetName(DOMString& aName) const
{
GetHTMLAttr(nsGkAtoms::name, aName);
}
void SetName(const nsAString& aName, ErrorResult& aError)
{
SetHTMLAttr(nsGkAtoms::name, aName, aError);
@@ -78,13 +90,19 @@ public:
SetHTMLBoolAttr(nsGkAtoms::noresize, aNoResize, aError);
}
// The XPCOM GetScrolling is OK for us
void GetScrolling(DOMString& aScrolling) const
{
GetHTMLAttr(nsGkAtoms::scrolling, aScrolling);
}
void SetScrolling(const nsAString& aScrolling, ErrorResult& aError)
{
SetHTMLAttr(nsGkAtoms::scrolling, aScrolling, aError);
}
// The XPCOM GetSrc is OK for us
void GetSrc(nsAString& aSrc) const
{
GetURIAttr(nsGkAtoms::src, nullptr, aSrc);
}
void SetSrc(const nsAString& aSrc, ErrorResult& aError)
{
SetAttrHelper(nsGkAtoms::src, aSrc);