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

Revert "backout bug 1134280 for fixing yandex search "Read more" link"

Browse Source 
This reverts commit 980f33daef.
This commit is contained in:
Roy Tam
2019-04-18 22:23:06 +08:00
parent 980f33daef
commit 01ed5ad3ac
249 changed files with 1850 additions and 1879 deletions
Download Patch File Download Diff File Expand all files Collapse all files
layout/mathml/nsMathMLmtableFrame.cpp
+7 -4
View File
@@ -116,7 +116,7 @@ static nsresult ReportParseError(nsIFrame* aFrame, const char16_t* aAttribute,
nsIContent* content = aFrame->GetContent();
const char16_t* params[] =
{ aValue, aAttribute, content->Tag()->GetUTF16String() };
{ aValue, aAttribute, content->NodeInfo()->NameAtom()->GetUTF16String() };
return nsContentUtils::ReportToConsole(nsIScriptError::errorFlag,
NS_LITERAL_CSTRING("Layout: MathML"),
@@ -643,7 +643,8 @@ ListMathMLTree(nsIFrame* atLeast)
nsIFrame* f = atLeast;
for ( ; f; f = f->GetParent()) {
nsIContent* c = f->GetContent();
if (!c || c->Tag() == nsGkAtoms::math || c->Tag() == nsGkAtoms::body)
if (!c || c->IsMathMLElement(nsGkAtoms::math) ||
c->NodeInfo()->NameAtom(nsGkAtoms::body)) // XXXbaku which kind of body tag?
break;
}
if (!f) f = atLeast;
@@ -1135,7 +1136,8 @@ nsMathMLmtdFrame::GetRowSpan()
int32_t rowspan = 1;
// Don't look at the content's rowspan if we're not an mtd or a pseudo cell.
if ((mContent->Tag() == nsGkAtoms::mtd_) && !StyleContext()->GetPseudo()) {
if (mContent->IsMathMLElement(nsGkAtoms::mtd_) &&
!StyleContext()->GetPseudo()) {
nsAutoString value;
mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::rowspan, value);
if (!value.IsEmpty()) {
@@ -1155,7 +1157,8 @@ nsMathMLmtdFrame::GetColSpan()
int32_t colspan = 1;
// Don't look at the content's colspan if we're not an mtd or a pseudo cell.
if ((mContent->Tag() == nsGkAtoms::mtd_) && !StyleContext()->GetPseudo()) {
if (mContent->IsMathMLElement(nsGkAtoms::mtd_) &&
!StyleContext()->GetPseudo()) {
nsAutoString value;
mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::columnspan_, value);
if (!value.IsEmpty()) {