mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-29 18:40:41 +00:00
import changes from rmottola/Arctic-Fox:
- Bug 940273 - Part 1 - Fetch changes from maple twig to support Service Worker Cache. (5f8e82dd7)
- Bug 940273 - Part 1b - Expose nsFileProtocolHandler.h in mozilla/net. (71a3ebcf4)
- Bug 940273 - Part 2 - Add a pref to enable Service Worker Cache. (2e7b478d3)
- patch header include (3b90a9b8d)
- override -> MOZ_OVERRIDE (8f51321bc)
- override -> MOZ_OVERRIDE (5f4ab5143)
- Bug 1136563 - ARIA 1.1: Support role 'switch' (2484c9c27)
- Bug 1121518 - ARIA 1.1: Add support for role 'searchbox' (8d3ee1204)
- override -> MOZ_OVERRIDE (3db7a0cb4)
- Bug 1137714 - Make roleDescription nicer/correct/faster (da6beb861)
- Bug 1134280 - Get rid of Tag() - patch 1 - Is{HTML,XUL,MathML,SVG}Element and IsAnyOf{HTML,XUL,MathML,SVG}Elements (133801ca1)
- Bug 1134280 - Get rid of Tag() - patch 2.1 - /accessible - Fix all the occurrences (fbef71d88)
- Bug 1134280 - Get rid of Tag() - patch 2.2 - /editor - Fix all the occurrences (e54a21dcc)
- Bug 1134280 - Get rid of Tag() - patch 2.3 - dom/base and docshell - Fix all the occurrences (8bf192106)
- Bug 1134280 - Get rid of Tag() - patch 2.4 - layout/mathml - Fix all the occurrences (7914f351d)
- Bug 1134280 - Get rid of Tag() - patch 2.5 - dom/xul - Fix all the occurrences (6611b95ef)
- Bug 1134280 - Get rid of Tag() - patch 2.6 - layout/base and layout/form - Fix all the occurrences (61e06ff31)
- Bug 1134280 - Get rid of Tag() - patch 2.7 - layout/generic - Fix all the occurrences (bbe5865c2)
- Bug 1134280 - Get rid of Tag() - patch 2.8 - dom/html - Fix all the occurrences (7af471da5)
- Bug 1134280 - Get rid of Tag() - patch 2.9 - dom/svg, dom/xml, dom/xslt and dom/xbl - Fix all the occurrences (ab9769748)
- Bug 1134280 - Get rid of Tag() - patch 2.10 - dom/events, dom/mathml, dom/plugins, dom/smil - Fix all the occurrences (421ba62f4)
- Bug 1134280 - Get rid of Tag() - patch 2.11 - layout/xul - Fix all the occurrences (e19e64b2c)
- Bug 1134280 - Get rid of Tag() - patch 2.12 - layout/style, layout/svg - Fix all the occurrences (7ec90f520)
- Bug 1134280 - Get rid of Tag() - patch 2.13 - Fix all the occurrences (a887a4341)
- Bug 1134280 - Get rid of Tag() - patch 3 - nsContentUtils::IsHTMLBlock should work with nsIContent inste nsIAtom (28fa04521)
- Bug 1134280 - Get rid of Tag() - patch 4 - Get rid of nsDocumentEncoder::IsTag (ed4bf4d48)
- Bug 1134280 - Get rid of Tag() - patch 5 - nsGenericHTMLElement::IsHTMLElement (70a2822c7)
- Bug 1134280 - Get rid of Tag() - patch 6 - Remove nsINode::Tag() (85885131f)
- Bug 1134280 - Get rid of Tag() - patch 7 - Followup to fix bustage. (actuall, backport, it was missing) (cfcfa3e74)
- Bug 1134280 - Get rid of Tag() - patch 8 - Fixed a debug-only compilation issue (502319995)
- Bug 1356843 - Fix -Wcomma warnings in dom/base/ and dom/xml/. clang's -Wcomma warning warns about suspicious use of the comma operator such as between two statements or to call a function for side effects within an expression. (0f1ad0554)
This commit is contained in:
@@ -317,8 +317,9 @@ IsOffsetParent(nsIFrame* aFrame)
|
||||
// with display: table-cell with no actual table
|
||||
nsIContent* content = aFrame->GetContent();
|
||||
|
||||
return content->IsHTML(nsGkAtoms::table) || content->IsHTML(nsGkAtoms::td)
|
||||
|| content->IsHTML(nsGkAtoms::th);
|
||||
return content->IsAnyOfHTMLElements(nsGkAtoms::table,
|
||||
nsGkAtoms::td,
|
||||
nsGkAtoms::th);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@@ -346,7 +347,8 @@ nsGenericHTMLElement::GetOffsetRect(CSSIntRect& aRect)
|
||||
Element* docElement = GetComposedDoc()->GetRootElement();
|
||||
nsIContent* content = frame->GetContent();
|
||||
|
||||
if (content && (content->IsHTML(nsGkAtoms::body) || content == docElement)) {
|
||||
if (content && (content->IsHTMLElement(nsGkAtoms::body) ||
|
||||
content == docElement)) {
|
||||
parent = frame;
|
||||
}
|
||||
else {
|
||||
@@ -378,7 +380,7 @@ nsGenericHTMLElement::GetOffsetRect(CSSIntRect& aRect)
|
||||
|
||||
// Break if the ancestor frame type makes it suitable as offset parent
|
||||
// and this element is *not* positioned or if we found the body element.
|
||||
if (isOffsetParent || content->IsHTML(nsGkAtoms::body)) {
|
||||
if (isOffsetParent || content->IsHTMLElement(nsGkAtoms::body)) {
|
||||
offsetParent = content;
|
||||
break;
|
||||
}
|
||||
@@ -438,7 +440,7 @@ nsGenericHTMLElement::Spellcheck()
|
||||
// Has the state has been explicitly set?
|
||||
nsIContent* node;
|
||||
for (node = this; node; node = node->GetParent()) {
|
||||
if (node->IsHTML()) {
|
||||
if (node->IsHTMLElement()) {
|
||||
static nsIContent::AttrValuesArray strings[] =
|
||||
{&nsGkAtoms::_true, &nsGkAtoms::_false, nullptr};
|
||||
switch (node->FindAttrValueIn(kNameSpaceID_None, nsGkAtoms::spellcheck,
|
||||
@@ -599,7 +601,7 @@ HTMLFormElement*
|
||||
nsGenericHTMLElement::FindAncestorForm(HTMLFormElement* aCurrentForm)
|
||||
{
|
||||
NS_ASSERTION(!HasAttr(kNameSpaceID_None, nsGkAtoms::form) ||
|
||||
IsHTML(nsGkAtoms::img),
|
||||
IsHTMLElement(nsGkAtoms::img),
|
||||
"FindAncestorForm should not be called if @form is set!");
|
||||
|
||||
// Make sure we don't end up finding a form that's anonymous from
|
||||
@@ -609,7 +611,7 @@ nsGenericHTMLElement::FindAncestorForm(HTMLFormElement* aCurrentForm)
|
||||
nsIContent* content = this;
|
||||
while (content != bindingParent && content) {
|
||||
// If the current ancestor is a form, return it as our form
|
||||
if (content->IsHTML(nsGkAtoms::form)) {
|
||||
if (content->IsHTMLElement(nsGkAtoms::form)) {
|
||||
#ifdef DEBUG
|
||||
if (!nsContentUtils::IsInSameAnonymousTree(this, content)) {
|
||||
// It's possible that we started unbinding at |content| or
|
||||
@@ -665,7 +667,8 @@ nsGenericHTMLElement::CheckHandleEventForAnchorsPreconditions(
|
||||
nsCOMPtr<nsIContent> target = aVisitor.mPresContext->EventStateManager()->
|
||||
GetEventTargetContent(aVisitor.mEvent);
|
||||
|
||||
return !target || !target->IsHTML(nsGkAtoms::area) || IsHTML(nsGkAtoms::area);
|
||||
return !target || !target->IsHTMLElement(nsGkAtoms::area) ||
|
||||
IsHTMLElement(nsGkAtoms::area);
|
||||
}
|
||||
|
||||
nsresult
|
||||
@@ -809,7 +812,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) { \
|
||||
@@ -825,7 +828,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; \
|
||||
@@ -842,7 +845,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) { \
|
||||
@@ -864,7 +867,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; \
|
||||
@@ -1012,7 +1015,7 @@ nsGenericHTMLElement::ParseAttribute(int32_t aNamespaceID,
|
||||
|
||||
aResult.ParseAtom(aValue);
|
||||
|
||||
if (CanHaveName(Tag())) {
|
||||
if (CanHaveName(NodeInfo()->NameAtom())) {
|
||||
SetHasName();
|
||||
AddToNameTable(aResult.GetAtomValue());
|
||||
}
|
||||
@@ -1797,17 +1800,15 @@ nsGenericHTMLElement::GetContextMenu(nsIDOMHTMLMenuElement** aContextMenu)
|
||||
bool
|
||||
nsGenericHTMLElement::IsLabelable() const
|
||||
{
|
||||
return Tag() == nsGkAtoms::progress ||
|
||||
Tag() == nsGkAtoms::meter;
|
||||
return IsAnyOfHTMLElements(nsGkAtoms::progress, nsGkAtoms::meter);
|
||||
}
|
||||
|
||||
bool
|
||||
nsGenericHTMLElement::IsInteractiveHTMLContent(bool aIgnoreTabindex) const
|
||||
{
|
||||
return Tag() == nsGkAtoms::details ||
|
||||
Tag() == nsGkAtoms::embed ||
|
||||
Tag() == nsGkAtoms::keygen ||
|
||||
(!aIgnoreTabindex && HasAttr(kNameSpaceID_None, nsGkAtoms::tabindex));
|
||||
return IsAnyOfHTMLElements(nsGkAtoms::details, nsGkAtoms::embed,
|
||||
nsGkAtoms::keygen) ||
|
||||
HasAttr(kNameSpaceID_None, nsGkAtoms::tabindex);
|
||||
}
|
||||
|
||||
already_AddRefed<UndoManager>
|
||||
@@ -2401,7 +2402,7 @@ nsGenericHTMLFormElement::FormIdUpdated(Element* aOldElement,
|
||||
nsGenericHTMLFormElement* element =
|
||||
static_cast<nsGenericHTMLFormElement*>(aData);
|
||||
|
||||
NS_ASSERTION(element->IsHTML(), "aData should be an HTML element");
|
||||
NS_ASSERTION(element->IsHTMLElement(), "aData should be an HTML element");
|
||||
|
||||
element->UpdateFormOwner(false, aNewElement);
|
||||
|
||||
@@ -2476,7 +2477,7 @@ nsGenericHTMLFormElement::UpdateFormOwner(bool aBindToTree,
|
||||
"element should be equals to the current element "
|
||||
"associated with the id in @form!");
|
||||
|
||||
if (element && element->IsHTML(nsGkAtoms::form)) {
|
||||
if (element && element->IsHTMLElement(nsGkAtoms::form)) {
|
||||
mForm = static_cast<HTMLFormElement*>(element);
|
||||
}
|
||||
}
|
||||
@@ -2814,7 +2815,7 @@ nsGenericHTMLElement::IsCurrentBodyElement()
|
||||
{
|
||||
// TODO Bug 698498: Should this handle the case where GetBody returns a
|
||||
// frameset?
|
||||
if (!IsHTML(nsGkAtoms::body)) {
|
||||
if (!IsHTMLElement(nsGkAtoms::body)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user