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

Make AsyncResponseListener methods take &mut self.

Browse source
This commit is contained in:
Eli Friedman 2015-10-15 16:44:39 -07:00
parent 9d5f09e09c
commit c1aff0b678
6 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script/cors.rs
View file

@ -112,13 +112,13 @@ impl CORSRequest {
// This is shoe-horning the CORSReponse stuff into the rest of the async network
// framework right now. It would be worth redesigning http_fetch to do this properly.
impl AsyncResponseListener for CORSContext {
fn headers_available(&self, _metadata: Metadata) {
fn headers_available(&mut self, _metadata: Metadata) {
}
fn data_available(&self, _payload: Vec<u8>) {
fn data_available(&mut self, _payload: Vec<u8>) {
}
fn response_complete(&self, _status: Result<(), String>) {
fn response_complete(&mut self, _status: Result<(), String>) {
let response = self.response.borrow_mut().take().unwrap();
self.listener.response_available(response);
}

6
components/script/dom/htmlscriptelement.rs
View file

@ -138,16 +138,16 @@ struct ScriptContext {
}
impl AsyncResponseListener for ScriptContext {
fn headers_available(&self, metadata: Metadata) {
fn headers_available(&mut self, metadata: Metadata) {
*self.metadata.borrow_mut() = Some(metadata);
}
fn data_available(&self, payload: Vec<u8>) {
fn data_available(&mut self, payload: Vec<u8>) {
let mut payload = payload;
self.data.borrow_mut().append(&mut payload);
}
fn response_complete(&self, status: Result<(), String>) {
fn response_complete(&mut self, status: Result<(), String>) {
let load = status.map(|_| {
let data = mem::replace(&mut *self.data.borrow_mut(), vec!());
let metadata = self.metadata.borrow_mut().take().unwrap();

6
components/script/dom/servohtmlparser.rs
View file

@ -97,7 +97,7 @@ impl ParserContext {
}
impl AsyncResponseListener for ParserContext {
fn headers_available(&self, metadata: Metadata) {
fn headers_available(&mut self, metadata: Metadata) {
let content_type = metadata.content_type.clone();
let parser = ScriptTask::page_fetch_complete(self.id.clone(), self.subpage.clone(),
@ -137,7 +137,7 @@ impl AsyncResponseListener for ParserContext {
}
}
fn data_available(&self, payload: Vec<u8>) {
fn data_available(&mut self, payload: Vec<u8>) {
if !self.is_image_document.get() {
// FIXME: use Vec<u8> (html5ever #34)
let data = UTF_8.decode(&payload, DecoderTrap::Replace).unwrap();
@ -149,7 +149,7 @@ impl AsyncResponseListener for ParserContext {
}
}
fn response_complete(&self, status: Result<(), String>) {
fn response_complete(&mut self, status: Result<(), String>) {
let parser = match self.parser.borrow().as_ref() {
Some(parser) => parser.root(),
None => return,

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

@ -237,7 +237,7 @@ impl XMLHttpRequest {
resource_task: ResourceTask,
load_data: LoadData) {
impl AsyncResponseListener for XHRContext {
fn headers_available(&self, metadata: Metadata) {
fn headers_available(&mut self, metadata: Metadata) {
let xhr = self.xhr.root();
let rv = xhr.r().process_headers_available(self.cors_request.clone(),
self.gen_id,
@ -247,13 +247,13 @@ impl XMLHttpRequest {
}
}
fn data_available(&self, payload: Vec<u8>) {
fn data_available(&mut self, payload: Vec<u8>) {
self.buf.borrow_mut().push_all(&payload);
let xhr = self.xhr.root();
xhr.r().process_data_available(self.gen_id, self.buf.borrow().clone());
}
fn response_complete(&self, status: Result<(), String>) {
fn response_complete(&mut self, status: Result<(), String>) {
let xhr = self.xhr.root();
let rv = xhr.r().process_response_complete(self.gen_id, status);
*self.sync_status.borrow_mut() = Some(rv);

4
components/script/network_listener.rs
View file

@ -43,9 +43,9 @@ struct ListenerRunnable<T: AsyncResponseListener + PreInvoke + Send> {
impl<T: AsyncResponseListener + PreInvoke + Send> Runnable for ListenerRunnable<T> {
fn handler(self: Box<ListenerRunnable<T>>) {
let this = *self;
let context = this.context.lock().unwrap();
let mut context = this.context.lock().unwrap();
if context.should_invoke() {
this.action.process(&*context);
this.action.process(&mut *context);
}
}
}