roytam1/palemoon27
1
0
Fork 0
mirror of https://github.com/roytam1/palemoon27.git synced 2026-05-29 10:08:38 +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
dom/base/nsObjectLoadingContent.cpp
+5 -5
View File
@@ -994,7 +994,7 @@ nsObjectLoadingContent::BuildParametersArray()
int32_t start = 0, end = content->GetAttrCount(), step = 1;
// HTML attributes are stored in reverse order.
if (content->IsHTML() && content->IsInHTMLDocument()) {
if (content->IsHTMLElement() && content->IsInHTMLDocument()) {
start = end - 1;
end = -1;
step = -1;
@@ -1046,7 +1046,7 @@ nsObjectLoadingContent::BuildParametersArray()
// Nav 4.x would simply replace the "data" with "src". Because some plugins correctly
// look for "data", lets instead copy the "data" attribute and add another entry
// to the bottom of the array if there isn't already a "src" specified.
if (content->Tag() == nsGkAtoms::object &&
if (content->IsHTMLElement(nsGkAtoms::object) &&
!content->HasAttr(kNameSpaceID_None, nsGkAtoms::src)) {
MozPluginParameter param;
content->GetAttr(kNameSpaceID_None, nsGkAtoms::data, param.mValue);
@@ -2930,13 +2930,13 @@ nsObjectLoadingContent::LoadFallback(FallbackType aType, bool aNotify) {
do_QueryInterface(static_cast<nsIImageLoadingContent*>(this));
NS_ASSERTION(thisContent, "must be a content");
if (!thisContent->IsHTML() || mContentType.IsEmpty()) {
if (!thisContent->IsHTMLElement() || mContentType.IsEmpty()) {
// Don't let custom fallback handlers run outside HTML, tags without a
// determined type should always just be alternate content
aType = eFallbackAlternate;
}
if (thisContent->Tag() == nsGkAtoms::object &&
if (thisContent->IsHTMLElement(nsGkAtoms::object) &&
(aType == eFallbackUnsupported ||
aType == eFallbackDisabled ||
aType == eFallbackBlocklisted))
@@ -2944,7 +2944,7 @@ nsObjectLoadingContent::LoadFallback(FallbackType aType, bool aNotify) {
// Show alternate content instead, if it exists
for (nsIContent* child = thisContent->GetFirstChild();
child; child = child->GetNextSibling()) {
if (!child->IsHTML(nsGkAtoms::param) &&
if (!child->IsHTMLElement(nsGkAtoms::param) &&
nsStyleUtil::IsSignificantChild(child, true, false)) {
aType = eFallbackAlternate;
break;