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

Backed out 2 changesets (bug 1687635) for Browser-chrome failures in browser/components/customizableui/test/browser_967000_button_charEncoding.js. CLOSED TREE

Browse Source 
Backed out changeset bd95df8be7ca (bug 1687635)
Backed out changeset 701981112733 (bug 1687635)
This commit is contained in:
Dorel Luca
2021-05-27 09:48:00 +03:00
parent 27035810d5
commit 110c3fac1d
16 changed files with 293 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
dom/html/nsHTMLDocument.cpp
View File

@@ -689,41 +689,7 @@ bool nsHTMLDocument::WillIgnoreCharsetOverride() {
return true;
}
}
switch (mCharacterSetSource) {
case kCharsetUninitialized:
case kCharsetFromFallback:
case kCharsetFromTopLevelDomain:
case kCharsetFromDocTypeDefault:
case kCharsetFromInitialAutoDetectionWouldHaveBeenUTF8:
case kCharsetFromInitialAutoDetectionWouldNotHaveBeenUTF8DependedOnTLD:
case kCharsetFromFinalJapaneseAutoDetection:
case kCharsetFromFinalAutoDetectionWouldHaveBeenUTF8:
case kCharsetFromFinalAutoDetectionWouldNotHaveBeenUTF8DependedOnTLD:
case kCharsetFromParentFrame:
case kCharsetFromXmlDeclaration:
case kCharsetFromMetaPrescan:
case kCharsetFromMetaTag:
case kCharsetFromChannel:
case kCharsetFromUserForced:
case kCharsetFromUserForcedJapaneseAutoDetection:
return false;
}
bool potentialEffect = false;
nsIPrincipal* parentPrincipal = NodePrincipal();
auto subDoc = [&potentialEffect, parentPrincipal](Document& aSubDoc) {
if (parentPrincipal->Equals(aSubDoc.NodePrincipal()) &&
!aSubDoc.WillIgnoreCharsetOverride()) {
potentialEffect = true;
return CallState::Stop;
}
return CallState::Continue;
};
EnumerateSubDocuments(subDoc);
return !potentialEffect;
return false;
}
void nsHTMLDocument::GetFormsAndFormControls(nsContentList** aFormList,