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

Qualify resource_task enums.

Browse source
This commit is contained in:
Ms2ger 2015-01-04 11:54:31 +01:00
parent b16f9cea09
commit 323daffbf0
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,9 @@ use js::jsapi::{JS_ParseJSON, JSContext};
use js::jsapi::JS_ClearPendingException; use js::jsapi::JS_ClearPendingException;
use js::jsval::{JSVal, NullValue, UndefinedValue}; use js::jsval::{JSVal, NullValue, UndefinedValue};
use net::resource_task::{ResourceTask, ResourceCORSData, Load, LoadData, LoadResponse, Payload, Done}; use net::resource_task::{ResourceTask, ResourceCORSData, LoadData, LoadResponse};
use net::resource_task::ControlMsg::Load;
use net::resource_task::ProgressMsg::{Payload, Done};
use cors::{allow_cross_origin_request, CORSRequest, RequestMode}; use cors::{allow_cross_origin_request, CORSRequest, RequestMode};
use servo_util::str::DOMString; use servo_util::str::DOMString;
use servo_util::task::spawn_named; use servo_util::task::spawn_named;

8
components/script/parse/html.rs
View file

@ -21,7 +21,7 @@ use parse::Parser;
use encoding::all::UTF_8; use encoding::all::UTF_8;
use encoding::types::{Encoding, DecoderTrap}; use encoding::types::{Encoding, DecoderTrap};
use servo_net::resource_task::{Payload, Done, LoadResponse}; use servo_net::resource_task::{ProgressMsg, LoadResponse};
use servo_util::task_state; use servo_util::task_state;
use servo_util::task_state::IN_HTML_PARSER; use servo_util::task_state::IN_HTML_PARSER;
use std::ascii::AsciiExt; use std::ascii::AsciiExt;
@ -186,15 +186,15 @@ pub fn parse_html(document: JSRef<Document>,
_ => { _ => {
for msg in load_response.progress_port.iter() { for msg in load_response.progress_port.iter() {
match msg { match msg {
Payload(data) => { ProgressMsg::Payload(data) => {
// FIXME: use Vec<u8> (html5ever #34) // FIXME: use Vec<u8> (html5ever #34)
let data = UTF_8.decode(data.as_slice(), DecoderTrap::Replace).unwrap(); let data = UTF_8.decode(data.as_slice(), DecoderTrap::Replace).unwrap();
parser.parse_chunk(data); parser.parse_chunk(data);
} }
Done(Err(err)) => { ProgressMsg::Done(Err(err)) => {
panic!("Failed to load page URL {}, error: {}", url.serialize(), err); panic!("Failed to load page URL {}, error: {}", url.serialize(), err);
} }
Done(Ok(())) => break, ProgressMsg::Done(Ok(())) => break,
} }
} }
} }

4
components/script/script_task.rs
View file

@ -52,7 +52,7 @@ use servo_msg::constellation_msg::{KeyModifiers, SUPER, SHIFT, CONTROL, ALT};
use servo_msg::constellation_msg::{PipelineExitType}; use servo_msg::constellation_msg::{PipelineExitType};
use servo_msg::constellation_msg::Msg as ConstellationMsg; use servo_msg::constellation_msg::Msg as ConstellationMsg;
use servo_net::image_cache_task::ImageCacheTask; use servo_net::image_cache_task::ImageCacheTask;
use servo_net::resource_task::{ResourceTask, Load}; use servo_net::resource_task::{ResourceTask, ControlMsg};
use servo_net::resource_task::LoadData as NetLoadData; use servo_net::resource_task::LoadData as NetLoadData;
use servo_net::storage_task::StorageTask; use servo_net::storage_task::StorageTask;
use servo_util::geometry::to_frac_px; use servo_util::geometry::to_frac_px;
@ -810,7 +810,7 @@ impl ScriptTask {
let (parser_input, final_url) = if !is_javascript { let (parser_input, final_url) = if !is_javascript {
// Wait for the LoadResponse so that the parser knows the final URL. // Wait for the LoadResponse so that the parser knows the final URL.
let (input_chan, input_port) = channel(); let (input_chan, input_port) = channel();
self.resource_task.send(Load(NetLoadData { self.resource_task.send(ControlMsg::Load(NetLoadData {
url: url, url: url,
method: load_data.method, method: load_data.method,
headers: load_data.headers, headers: load_data.headers,