corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1134280 - Get rid of Tag() - patch 2.8 - dom/html - Fix all the occurrences, m=smaug, r=surkov

Browse Source
This commit is contained in:
Andrea Marchesini
2015-03-03 11:09:00 +00:00
parent 40ecc85b89
commit 0cd435c47f
12 changed files with 49 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dom/html/nsGenericHTMLElement.cpp
View File

@@ -802,7 +802,7 @@ nsGenericHTMLElement::GetEventListenerManagerForAttr(nsIAtom* aAttrName,
EventHandlerNonNull* \
nsGenericHTMLElement::GetOn##name_() \
{ \
if (Tag() == nsGkAtoms::body || Tag() == nsGkAtoms::frameset) { \
if (IsAnyOfHTMLElements(nsGkAtoms::body, nsGkAtoms::frameset)) { \
/* XXXbz note to self: add tests for this! */ \
nsPIDOMWindow* win = OwnerDoc()->GetInnerWindow(); \
if (win) { \
@@ -818,7 +818,7 @@ nsGenericHTMLElement::GetOn##name_() \
void \
nsGenericHTMLElement::SetOn##name_(EventHandlerNonNull* handler) \
{ \
if (Tag() == nsGkAtoms::body || Tag() == nsGkAtoms::frameset) { \
if (IsAnyOfHTMLElements(nsGkAtoms::body, nsGkAtoms::frameset)) { \
nsPIDOMWindow* win = OwnerDoc()->GetInnerWindow(); \
if (!win) { \
return; \
@@ -835,7 +835,7 @@ nsGenericHTMLElement::SetOn##name_(EventHandlerNonNull* handler) \
already_AddRefed<EventHandlerNonNull> \
nsGenericHTMLElement::GetOn##name_() \
{ \
if (Tag() == nsGkAtoms::body || Tag() == nsGkAtoms::frameset) { \
if (IsAnyOfHTMLElements(nsGkAtoms::body, nsGkAtoms::frameset)) { \
/* XXXbz note to self: add tests for this! */ \
nsPIDOMWindow* win = OwnerDoc()->GetInnerWindow(); \
if (win) { \
@@ -857,7 +857,7 @@ nsGenericHTMLElement::GetOn##name_() \
void \
nsGenericHTMLElement::SetOn##name_(EventHandlerNonNull* handler) \
{ \
if (Tag() == nsGkAtoms::body || Tag() == nsGkAtoms::frameset) { \
if (IsAnyOfHTMLElements(nsGkAtoms::body, nsGkAtoms::frameset)) { \
nsPIDOMWindow* win = OwnerDoc()->GetInnerWindow(); \
if (!win) { \
return; \
@@ -1005,7 +1005,7 @@ nsGenericHTMLElement::ParseAttribute(int32_t aNamespaceID,
aResult.ParseAtom(aValue);
if (CanHaveName(Tag())) {
if (CanHaveName(NodeInfo()->NameAtom())) {
SetHasName();
AddToNameTable(aResult.GetAtomValue());
}
@@ -1790,16 +1790,14 @@ nsGenericHTMLElement::GetContextMenu(nsIDOMHTMLMenuElement** aContextMenu)
bool
nsGenericHTMLElement::IsLabelable() const
{
return Tag() == nsGkAtoms::progress ||
Tag() == nsGkAtoms::meter;
return IsAnyOfHTMLElements(nsGkAtoms::progress, nsGkAtoms::meter);
}
bool
nsGenericHTMLElement::IsInteractiveHTMLContent() const
{
return Tag() == nsGkAtoms::details ||
Tag() == nsGkAtoms::embed ||
Tag() == nsGkAtoms::keygen ||
return IsAnyOfHTMLElements(nsGkAtoms::details, nsGkAtoms::embed,
nsGkAtoms::keygen) ||
HasAttr(kNameSpaceID_None, nsGkAtoms::tabindex);
}