KotJohansson/palemoon27
1
0
Fork 0
mirror of https://github.com/roytam1/palemoon27.git synced 2026-05-26 14:30:27 +00:00
Code Issues Projects Releases Wiki Activity

import changes from rmottola/Arctic-Fox:

Browse Source 
- 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:
Roy Tam
2019-02-23 00:13:11 +08:00
parent c5cfe29d26
commit 9ca494cce7
286 changed files with 2461 additions and 2095 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dom/base/nsDocumentEncoder.cpp
+54 -62
View File
@@ -134,8 +134,6 @@ protected:
return true;
}
static bool IsTag(nsIContent* aContent, nsIAtom* aAtom);
virtual bool IncludeInContext(nsINode *aNode);
nsCOMPtr<nsIDocument> mDocument;
@@ -530,7 +528,7 @@ nsDocumentEncoder::SerializeToStringIterative(nsINode* aNode,
current->NodeType() == nsIDOMNode::DOCUMENT_FRAGMENT_NODE) {
DocumentFragment* frag = static_cast<DocumentFragment*>(current);
nsIContent* host = frag->GetHost();
if (host && host->IsHTML(nsGkAtoms::_template)) {
if (host && host->IsHTMLElement(nsGkAtoms::_template)) {
current = host;
}
}
@@ -541,12 +539,6 @@ nsDocumentEncoder::SerializeToStringIterative(nsINode* aNode,
return NS_OK;
}
bool
nsDocumentEncoder::IsTag(nsIContent* aContent, nsIAtom* aAtom)
{
return aContent && aContent->Tag() == aAtom;
}
static nsresult
ConvertAndWrite(const nsAString& aString,
nsIOutputStream* aStream,
@@ -1032,7 +1024,7 @@ static bool ParentIsTR(nsIContent* aContent) {
if (!parent) {
return false;
}
return parent->IsHTML(nsGkAtoms::tr);
return parent->IsHTMLElement(nsGkAtoms::tr);
}
@@ -1102,7 +1094,7 @@ nsDocumentEncoder::EncodeToStringWithMaxLength(uint32_t aMaxLength,
NS_ENSURE_SUCCESS(rv, rv);
}
nsCOMPtr<nsIContent> content = do_QueryInterface(node);
if (content && content->IsHTML(nsGkAtoms::tr) && !ParentIsTR(content)) {
if (content && content->IsHTMLElement(nsGkAtoms::tr) && !ParentIsTR(content)) {
nsINode* n = content;
if (!prevNode) {
// Went from a non-<tr> to a <tr>
@@ -1387,9 +1379,7 @@ nsHTMLCopyEncoder::SetSelection(nsISelection* aSelection)
selContent = selContent->GetParent())
{
// checking for selection inside a plaintext form widget
nsIAtom *atom = selContent->Tag();
if (atom == nsGkAtoms::input ||
atom == nsGkAtoms::textarea)
if (selContent->IsAnyOfHTMLElements(nsGkAtoms::input, nsGkAtoms::textarea))
{
mIsTextWidget = true;
break;
@@ -1410,7 +1400,7 @@ nsHTMLCopyEncoder::SetSelection(nsISelection* aSelection)
// also consider ourselves in a text widget if we can't find an html document
nsCOMPtr<nsIHTMLDocument> htmlDoc = do_QueryInterface(mDocument);
if (!(htmlDoc && mDocument->IsHTML())) {
if (!(htmlDoc && mDocument->IsHTMLDocument())) {
mIsTextWidget = true;
mSelection = aSelection;
// mMimeType is set to text/plain when encoding starts.
@@ -1523,34 +1513,32 @@ nsHTMLCopyEncoder::IncludeInContext(nsINode *aNode)
if (!content)
return false;
nsIAtom *tag = content->Tag();
return (tag == nsGkAtoms::b ||
tag == nsGkAtoms::i ||
tag == nsGkAtoms::u ||
tag == nsGkAtoms::a ||
tag == nsGkAtoms::tt ||
tag == nsGkAtoms::s ||
tag == nsGkAtoms::big ||
tag == nsGkAtoms::small ||
tag == nsGkAtoms::strike ||
tag == nsGkAtoms::em ||
tag == nsGkAtoms::strong ||
tag == nsGkAtoms::dfn ||
tag == nsGkAtoms::code ||
tag == nsGkAtoms::cite ||
tag == nsGkAtoms::var ||
tag == nsGkAtoms::abbr ||
tag == nsGkAtoms::font ||
tag == nsGkAtoms::script ||
tag == nsGkAtoms::span ||
tag == nsGkAtoms::pre ||
tag == nsGkAtoms::h1 ||
tag == nsGkAtoms::h2 ||
tag == nsGkAtoms::h3 ||
tag == nsGkAtoms::h4 ||
tag == nsGkAtoms::h5 ||
tag == nsGkAtoms::h6);
return content->IsAnyOfHTMLElements(nsGkAtoms::b,
nsGkAtoms::i,
nsGkAtoms::u,
nsGkAtoms::a,
nsGkAtoms::tt,
nsGkAtoms::s,
nsGkAtoms::big,
nsGkAtoms::small,
nsGkAtoms::strike,
nsGkAtoms::em,
nsGkAtoms::strong,
nsGkAtoms::dfn,
nsGkAtoms::code,
nsGkAtoms::cite,
nsGkAtoms::var,
nsGkAtoms::abbr,
nsGkAtoms::font,
nsGkAtoms::script,
nsGkAtoms::span,
nsGkAtoms::pre,
nsGkAtoms::h1,
nsGkAtoms::h2,
nsGkAtoms::h3,
nsGkAtoms::h4,
nsGkAtoms::h5,
nsGkAtoms::h6);
}
@@ -1714,10 +1702,11 @@ nsHTMLCopyEncoder::GetPromotedPoint(Endpoint aWhere, nsIDOMNode *aNode, int32_t
if (bResetPromotion)
{
nsCOMPtr<nsIContent> content = do_QueryInterface(parent);
if (content)
if (content && content->IsHTMLElement())
{
bool isBlock = false;
parserService->IsBlock(parserService->HTMLAtomTagToId(content->Tag()), isBlock);
parserService->IsBlock(parserService->HTMLAtomTagToId(
content->NodeInfo()->NameAtom()), isBlock);
if (isBlock)
{
bResetPromotion = false;
@@ -1796,10 +1785,11 @@ nsHTMLCopyEncoder::GetPromotedPoint(Endpoint aWhere, nsIDOMNode *aNode, int32_t
if (bResetPromotion)
{
nsCOMPtr<nsIContent> content = do_QueryInterface(parent);
if (content)
if (content && content->IsHTMLElement())
{
bool isBlock = false;
parserService->IsBlock(parserService->HTMLAtomTagToId(content->Tag()), isBlock);
parserService->IsBlock(parserService->HTMLAtomTagToId(
content->NodeInfo()->NameAtom()), isBlock);
if (isBlock)
{
bResetPromotion = false;
@@ -1858,7 +1848,7 @@ nsHTMLCopyEncoder::IsMozBR(nsIDOMNode* aNode)
MOZ_ASSERT(aNode);
nsCOMPtr<Element> element = do_QueryInterface(aNode);
return element &&
element->IsHTML(nsGkAtoms::br) &&
element->IsHTMLElement(nsGkAtoms::br) &&
element->AttrValueIs(kNameSpaceID_None, nsGkAtoms::type,
NS_LITERAL_STRING("_moz"), eIgnoreCase);
}
@@ -1890,16 +1880,17 @@ bool
nsHTMLCopyEncoder::IsRoot(nsIDOMNode* aNode)
{
nsCOMPtr<nsIContent> content = do_QueryInterface(aNode);
if (content)
{
if (mIsTextWidget)
return (IsTag(content, nsGkAtoms::div));
return (IsTag(content, nsGkAtoms::body) ||
IsTag(content, nsGkAtoms::td) ||
IsTag(content, nsGkAtoms::th));
if (!content) {
return false;
}
return false;
if (mIsTextWidget) {
return content->IsHTMLElement(nsGkAtoms::div);
}
return content->IsAnyOfHTMLElements(nsGkAtoms::body,
nsGkAtoms::td,
nsGkAtoms::th);
}
bool
@@ -2017,11 +2008,12 @@ nsHTMLCopyEncoder::GetImmediateContextCount(const nsTArray<nsINode*>& aAncestorA
break;
}
nsCOMPtr<nsIContent> content(do_QueryInterface(node));
if (!content || !content->IsHTML() || (content->Tag() != nsGkAtoms::tr &&
content->Tag() != nsGkAtoms::thead &&
content->Tag() != nsGkAtoms::tbody &&
content->Tag() != nsGkAtoms::tfoot &&
content->Tag() != nsGkAtoms::table)) {
if (!content ||
!content->IsAnyOfHTMLElements(nsGkAtoms::tr,
nsGkAtoms::thead,
nsGkAtoms::tbody,
nsGkAtoms::tfoot,
nsGkAtoms::table)) {
break;
}
++j;