Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Clean up the code to BOM sniff.

Browse source 
See https://github.com/servo/servo/pull/28006#discussion_r551968553
This commit is contained in:
Andreu Botella 2021-01-09 19:18:22 +01:00
parent 344cc39d50
commit d2b9e64cf3
1 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
components/script/dom/servoparser/mod.rs
View file

@ -487,28 +487,18 @@ impl ServoParser {
// encoding based on the BOM, but it won't change // encoding based on the BOM, but it won't change
// `self.document.encoding` in the process. // `self.document.encoding` in the process.
{ {
let set_bom_to_none = if let Some(partial_bom) = self.bom_sniff.borrow_mut().as_mut() { let mut bom_sniff = self.bom_sniff.borrow_mut();
if let Some(partial_bom) = bom_sniff.as_mut() {
if partial_bom.len() + chunk.len() >= 3 { if partial_bom.len() + chunk.len() >= 3 {
partial_bom.extend(chunk.iter().take(3 - partial_bom.len()).copied()); partial_bom.extend(chunk.iter().take(3 - partial_bom.len()).copied());
//println!("Full BOM: {:?}", partial_bom);
if let Some((encoding, _)) = Encoding::for_bom(&partial_bom) { if let Some((encoding, _)) = Encoding::for_bom(&partial_bom) {
//println!("Encoding: {}", encoding.name());
self.document.set_encoding(encoding); self.document.set_encoding(encoding);
} else { }
//println!("Bytes are not a BOM."); drop(bom_sniff);
}; *self.bom_sniff.borrow_mut() = None;
true
} else { } else {
partial_bom.extend(chunk.iter().copied()); partial_bom.extend(chunk.iter().copied());
//println!("Partial BOM: {:?}", partial_bom);
false
} }
} else {
//println!("partial_bom is None");
false
};
if set_bom_to_none {
*self.bom_sniff.borrow_mut() = None;
} }
} }