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

Implement final_mime_type and final_charset helpers and use in text_response

Browse source
This commit is contained in:
Jitendra Jain 2015-11-29 15:59:48 -05:00
parent 2be60be062
commit af7c0837f4
4 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -995,20 +995,9 @@ impl XMLHttpRequest {
}
}
//FIXME: add support for override_mime_type and override_charset
//FIXME: add support for XML encoding guess stuff using XML spec
fn text_response(&self) -> String {
let mut encoding = UTF_8 as EncodingRef;
match self.response_headers.borrow().get() {
Some(&ContentType(mime::Mime(_, _, ref params))) => {
for &(ref name, ref value) in params {
if name == &mime::Attr::Charset {
encoding = encoding_from_whatwg_label(&value.to_string()).unwrap_or(encoding);
}
}
},
None => {}
}
let encoding = self.final_charset().unwrap_or(UTF_8);
// According to Simon, decode() should never return an error, so unwrap()ing
// the result should be fine. XXXManishearth have a closer look at this later
@ -1102,6 +1091,34 @@ impl XMLHttpRequest {
}
Ok(())
}
fn final_charset(&self) -> Option<EncodingRef> {
if self.override_charset.borrow().is_some() {
self.override_charset.borrow().clone()
} else {
match self.response_headers.borrow().get() {
Some(&ContentType(ref mime)) => {
let value = mime.get_param(mime::Attr::Charset);
value.and_then(|value|{
encoding_from_whatwg_label(value)
})
}
None => { None }
}
}
}
#[allow(dead_code)]
fn final_mime_type(&self) -> Option<Mime> {
if self.override_mime_type.borrow().is_some() {
self.override_mime_type.borrow().clone()
} else {
match self.response_headers.borrow().get() {
Some(&ContentType(ref mime)) => { Some(mime.clone()) },
None => { None }
}
}
}
}
trait Extractable {

5
tests/wpt/metadata/XMLHttpRequest/overridemimetype-headers-received-state-force-shiftjis.htm.ini
View file

@ -1,5 +0,0 @@
[overridemimetype-headers-received-state-force-shiftjis.htm]
type: testharness
[XMLHttpRequest: overrideMimeType() in HEADERS RECEIVED state, enforcing Shift-JIS encoding]
expected: FAIL

6
tests/wpt/metadata/XMLHttpRequest/overridemimetype-open-state-force-utf-8.htm.ini
View file

@ -1,6 +0,0 @@
[overridemimetype-open-state-force-utf-8.htm]
type: testharness
expected: TIMEOUT
[XMLHttpRequest: overrideMimeType() in open state, enforcing UTF-8 encoding]
expected: TIMEOUT

6
tests/wpt/metadata/XMLHttpRequest/overridemimetype-unsent-state-force-shiftjis.htm.ini
View file

@ -1,6 +0,0 @@
[overridemimetype-unsent-state-force-shiftjis.htm]
type: testharness
expected: TIMEOUT
[XMLHttpRequest: overrideMimeType() in unsent state, enforcing Shift-JIS encoding]
expected: TIMEOUT