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

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

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};