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

auto merge of #4887 : Ms2ger/servo/servo_net, r=jdm

Browse source
This commit is contained in:
bors-servo 2015-02-10 05:15:45 -07:00
commit e3a4d49311
30 changed files with 56 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/dom/bindings/global.rs
View file

@ -14,7 +14,7 @@ use dom::workerglobalscope::{WorkerGlobalScope, WorkerGlobalScopeHelpers};
use dom::window;
use script_task::ScriptChan;
use servo_net::resource_task::ResourceTask;
use net::resource_task::ResourceTask;
use js::{JSCLASS_IS_GLOBAL, JSCLASS_IS_DOMJSCLASS};
use js::glue::{GetGlobalForObjectCrossCompartment};

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

@ -25,7 +25,7 @@ use script_task::{ScriptTask, ScriptChan, ScriptMsg, TimerSource};
use script_task::ScriptMsg::WorkerDispatchErrorEvent;
use script_task::StackRootTLS;
use servo_net::resource_task::{ResourceTask, load_whole_resource};
use net::resource_task::{ResourceTask, load_whole_resource};
use util::task::spawn_named;
use util::task_state;
use util::task_state::{SCRIPT, IN_WORKER};

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

@ -17,7 +17,7 @@ use dom::element::ElementTypeId;
use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
use dom::node::{Node, NodeTypeId, NodeHelpers, NodeDamage, window_from_node};
use dom::virtualmethods::VirtualMethods;
use servo_net::image_cache_task;
use net::image_cache_task;
use util::geometry::to_px;
use util::str::DOMString;
use string_cache::Atom;

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

@ -20,8 +20,8 @@ use dom::node::{Node, NodeTypeId, NodeHelpers, window_from_node};
use dom::validitystate::ValidityState;
use dom::virtualmethods::VirtualMethods;
use servo_net::image_cache_task;
use servo_net::image_cache_task::ImageCacheTask;
use net::image_cache_task;
use net::image_cache_task::ImageCacheTask;
use util::str::DOMString;
use string_cache::Atom;

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

@ -29,7 +29,7 @@ use script_task::{ScriptMsg, Runnable};
use encoding::all::UTF_8;
use encoding::types::{Encoding, DecoderTrap};
use servo_net::resource_task::load_whole_resource;
use net::resource_task::load_whole_resource;
use util::str::{DOMString, HTML_SPACE_CHARACTERS, StaticStringVec};
use std::borrow::ToOwned;
use std::cell::Cell;

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

@ -9,8 +9,8 @@ use dom::bindings::js::{JSRef, Temporary};
use dom::bindings::utils::{Reflector, reflect_dom_object};
use dom::bindings::error::Fallible;
use util::str::DOMString;
use servo_net::storage_task::StorageTask;
use servo_net::storage_task::StorageTaskMsg;
use net::storage_task::StorageTask;
use net::storage_task::StorageTaskMsg;
use std::sync::mpsc::channel;
use url::Url;

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

@ -35,8 +35,8 @@ use timers::{IsInterval, TimerId, TimerManager, TimerCallback};
use msg::compositor_msg::ScriptListener;
use msg::constellation_msg::LoadData;
use servo_net::image_cache_task::ImageCacheTask;
use servo_net::storage_task::StorageTask;
use net::image_cache_task::ImageCacheTask;
use net::storage_task::StorageTask;
use util::str::{DOMString,HTML_SPACE_CHARACTERS};
use js::jsapi::JS_EvaluateUCScript;

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

@ -19,7 +19,7 @@ use dom::window::{base64_atob, base64_btoa};
use script_task::{ScriptChan, TimerSource};
use timers::{IsInterval, TimerId, TimerManager, TimerCallback};
use servo_net::resource_task::{ResourceTask, load_whole_resource};
use net::resource_task::{ResourceTask, load_whole_resource};
use util::str::DOMString;
use js::jsapi::JSContext;

1
components/script/lib.rs
View file

@ -32,7 +32,6 @@ extern crate canvas;
extern crate script_traits;
#[no_link] #[plugin] #[macro_use]
extern crate "plugins" as servo_plugins;
extern crate "net" as servo_net;
extern crate util;
#[macro_use]
extern crate style;

4
components/script/page.rs
View file

@ -25,8 +25,8 @@ use js::rust::Cx;
use msg::compositor_msg::ScriptListener;
use msg::constellation_msg::{ConstellationChan, WindowSizeData};
use msg::constellation_msg::{PipelineId, SubpageId};
use servo_net::resource_task::ResourceTask;
use servo_net::storage_task::StorageTask;
use net::resource_task::ResourceTask;
use net::storage_task::StorageTask;
use util::geometry::{Au, MAX_RECT};
use util::geometry;
use util::str::DOMString;

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

@ -23,7 +23,7 @@ use parse::Parser;
use encoding::all::UTF_8;
use encoding::types::{Encoding, DecoderTrap};
use servo_net::resource_task::{ProgressMsg, LoadResponse};
use net::resource_task::{ProgressMsg, LoadResponse};
use util::task_state;
use util::task_state::IN_HTML_PARSER;
use std::ascii::AsciiExt;

8
components/script/script_task.rs
View file

@ -59,10 +59,10 @@ use msg::constellation_msg::{Failure, Msg, WindowSizeData, Key, KeyState};
use msg::constellation_msg::{KeyModifiers, SUPER, SHIFT, CONTROL, ALT};
use msg::constellation_msg::{PipelineExitType};
use msg::constellation_msg::Msg as ConstellationMsg;
use servo_net::image_cache_task::ImageCacheTask;
use servo_net::resource_task::{ResourceTask, ControlMsg};
use servo_net::resource_task::LoadData as NetLoadData;
use servo_net::storage_task::StorageTask;
use net::image_cache_task::ImageCacheTask;
use net::resource_task::{ResourceTask, ControlMsg};
use net::resource_task::LoadData as NetLoadData;
use net::storage_task::StorageTask;
use util::geometry::to_frac_px;
use util::smallvec::SmallVec;
use util::str::DOMString;