auto merge of #2442 : Manishearth/servo/xhr-async, r=jdm

(Note that only `getAllResponseHeaders()` is supported at the moment, I'll be adding the other header methods later.)
This commit is contained in:
bors-servo 2014-05-20 12:16:35 -04:00
commit 28e3c17340
8 changed files with 253 additions and 51 deletions

View file

@ -22,6 +22,7 @@ use dom::eventtarget::{EventTarget, EventTargetHelpers};
use dom::node;
use dom::node::{Node, NodeHelpers};
use dom::window::{TimerId, Window, WindowHelpers};
use dom::xmlhttprequest::{TrustedXHRAddress, XMLHttpRequest, XHRProgress};
use html::hubbub_html_parser::HtmlParserResult;
use html::hubbub_html_parser::{HtmlDiscoveredStyle, HtmlDiscoveredScript};
use html::hubbub_html_parser;
@ -89,6 +90,8 @@ pub enum ScriptMsg {
ExitPipelineMsg(PipelineId),
/// Notifies the script that a window associated with a particular pipeline should be closed.
ExitWindowMsg(PipelineId),
/// Notifies the script of progress on a fetch
XHRProgressMsg(TrustedXHRAddress, XHRProgress)
}
pub struct NewLayoutInfo {
@ -780,6 +783,7 @@ impl ScriptTask {
ExitPipelineMsg(id) => if self.handle_exit_pipeline_msg(id) { return false },
ExitWindowMsg(id) => self.handle_exit_window_msg(id),
ResizeMsg(..) => fail!("should have handled ResizeMsg already"),
XHRProgressMsg(addr, progress) => XMLHttpRequest::handle_xhr_progress(addr, progress),
}
}