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

Store the encoding in the Document rather than its name.

Browse source
This commit is contained in:
Ms2ger 2016-03-18 16:22:29 +01:00
parent e551ea7322
commit b1cd28e9c6
3 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

76
components/script/dom/document.rs
View file

@ -76,6 +76,8 @@ use dom::touchlist::TouchList;
use dom::treewalker::TreeWalker; use dom::treewalker::TreeWalker;
use dom::uievent::UIEvent; use dom::uievent::UIEvent;
use dom::window::{ReflowReason, Window}; use dom::window::{ReflowReason, Window};
use encoding::EncodingRef;
use encoding::all::UTF_8;
use euclid::point::Point2D; use euclid::point::Point2D;
use html5ever::tree_builder::{LimitedQuirks, NoQuirks, Quirks, QuirksMode}; use html5ever::tree_builder::{LimitedQuirks, NoQuirks, Quirks, QuirksMode};
use ipc_channel::ipc::{self, IpcSender}; use ipc_channel::ipc::{self, IpcSender};
@ -138,7 +140,7 @@ pub struct Document {
location: MutNullableHeap<JS<Location>>, location: MutNullableHeap<JS<Location>>,
content_type: DOMString, content_type: DOMString,
last_modified: Option<String>, last_modified: Option<String>,
encoding_name: DOMRefCell<DOMString>, encoding: Cell<EncodingRef>,
is_html_document: bool, is_html_document: bool,
url: Url, url: Url,
quirks_mode: Cell<QuirksMode>, quirks_mode: Cell<QuirksMode>,
@ -295,11 +297,6 @@ impl Document {
&*self.window &*self.window
} }
#[inline]
pub fn encoding_name(&self) -> Ref<DOMString> {
self.encoding_name.borrow()
}
#[inline] #[inline]
pub fn is_html_document(&self) -> bool { pub fn is_html_document(&self) -> bool {
self.is_html_document self.is_html_document
@ -393,36 +390,12 @@ impl Document {
} }
} }
pub fn set_encoding_name(&self, name: DOMString) { pub fn encoding(&self) -> EncodingRef {
*self.encoding_name.borrow_mut() = DOMString::from( self.encoding.get()
match name.as_ref() { }
"utf-8" => "UTF-8",
"ibm866" => "IBM866", pub fn set_encoding(&self, encoding: EncodingRef) {
"iso-8859-2" => "ISO-8859-2", self.encoding.set(encoding);
"iso-8859-3" => "ISO-8859-3",
"iso-8859-4" => "ISO-8859-4",
"iso-8859-5" => "ISO-8859-5",
"iso-8859-6" => "ISO-8859-6",
"iso-8859-7" => "ISO-8859-7",
"iso-8859-8" => "ISO-8859-8",
"iso-8859-8-i" => "ISO-8859-8-I",
"iso-8859-10" => "ISO-8859-10",
"iso-8859-13" => "ISO-8859-13",
"iso-8859-14" => "ISO-8859-14",
"iso-8859-15" => "ISO-8859-15",
"iso-8859-16" => "ISO-8859-16",
"koi8-r" => "KOI8-R",
"koi8-u" => "KOI8-U",
"gbk" => "GBK",
"big5" => "Big5",
"euc-jp" => "EUC-JP",
"iso-2022-jp" => "ISO-2022-JP",
"shift_jis" => "Shift_JIS",
"euc-kr" => "EUC-KR",
"utf-16be" => "UTF-16BE",
"utf-16le" => "UTF-16LE",
_ => &*name
});
} }
pub fn content_changed(&self, node: &Node, damage: NodeDamage) { pub fn content_changed(&self, node: &Node, damage: NodeDamage) {
@ -1561,7 +1534,7 @@ impl Document {
// https://dom.spec.whatwg.org/#concept-document-quirks // https://dom.spec.whatwg.org/#concept-document-quirks
quirks_mode: Cell::new(NoQuirks), quirks_mode: Cell::new(NoQuirks),
// https://dom.spec.whatwg.org/#concept-document-encoding // https://dom.spec.whatwg.org/#concept-document-encoding
encoding_name: DOMRefCell::new(DOMString::from("UTF-8")), encoding: Cell::new(UTF_8),
is_html_document: is_html_document == IsHTMLDocument::HTMLDocument, is_html_document: is_html_document == IsHTMLDocument::HTMLDocument,
id_map: DOMRefCell::new(HashMap::new()), id_map: DOMRefCell::new(HashMap::new()),
tag_map: DOMRefCell::new(HashMap::new()), tag_map: DOMRefCell::new(HashMap::new()),
@ -1818,7 +1791,34 @@ impl DocumentMethods for Document {
// https://dom.spec.whatwg.org/#dom-document-characterset // https://dom.spec.whatwg.org/#dom-document-characterset
fn CharacterSet(&self) -> DOMString { fn CharacterSet(&self) -> DOMString {
self.encoding_name.borrow().clone() DOMString::from(match self.encoding.get().name() {
"utf-8" => "UTF-8",
"ibm866" => "IBM866",
"iso-8859-2" => "ISO-8859-2",
"iso-8859-3" => "ISO-8859-3",
"iso-8859-4" => "ISO-8859-4",
"iso-8859-5" => "ISO-8859-5",
"iso-8859-6" => "ISO-8859-6",
"iso-8859-7" => "ISO-8859-7",
"iso-8859-8" => "ISO-8859-8",
"iso-8859-8-i" => "ISO-8859-8-I",
"iso-8859-10" => "ISO-8859-10",
"iso-8859-13" => "ISO-8859-13",
"iso-8859-14" => "ISO-8859-14",
"iso-8859-15" => "ISO-8859-15",
"iso-8859-16" => "ISO-8859-16",
"koi8-r" => "KOI8-R",
"koi8-u" => "KOI8-U",
"gbk" => "GBK",
"big5" => "Big5",
"euc-jp" => "EUC-JP",
"iso-2022-jp" => "ISO-2022-JP",
"shift_jis" => "Shift_JIS",
"euc-kr" => "EUC-KR",
"utf-16be" => "UTF-16BE",
"utf-16le" => "UTF-16LE",
name => name
})
} }
// https://dom.spec.whatwg.org/#dom-document-charset // https://dom.spec.whatwg.org/#dom-document-charset

2
components/script/dom/node.rs
View file

@ -1696,7 +1696,7 @@ impl Node {
NodeTypeId::Document(_) => { NodeTypeId::Document(_) => {
let node_doc = node.downcast::<Document>().unwrap(); let node_doc = node.downcast::<Document>().unwrap();
let copy_doc = copy.downcast::<Document>().unwrap(); let copy_doc = copy.downcast::<Document>().unwrap();
copy_doc.set_encoding_name(node_doc.encoding_name().clone()); copy_doc.set_encoding(node_doc.encoding());
copy_doc.set_quirks_mode(node_doc.quirks_mode()); copy_doc.set_quirks_mode(node_doc.quirks_mode());
}, },
NodeTypeId::Element(..) => { NodeTypeId::Element(..) => {

2
components/script/dom/xmlhttprequest.rs
View file

@ -1150,7 +1150,7 @@ impl XMLHttpRequest {
_ => { return None; } _ => { return None; }
} }
// Step 9 // Step 9
temp_doc.set_encoding_name(DOMString::from(charset.name())); temp_doc.set_encoding(charset);
// Step 13 // Step 13
self.response_xml.set(Some(temp_doc.r())); self.response_xml.set(Some(temp_doc.r()));
return self.response_xml.get(); return self.response_xml.get();