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

script: Fix test failures.

Browse source
This commit is contained in:
Patrick Walton 2015-07-31 11:48:47 -07:00
parent 024c4df912
commit 61e3a9545e
5 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -116,7 +116,7 @@ impl<'a> GlobalRef<'a> {
let doc = window.Document();
let doc = doc.r();
let loader = doc.loader();
loader.resource_task.clone()
(*loader.resource_task).clone()
}
GlobalRef::Worker(ref worker) => worker.resource_task().clone(),
}

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

@ -74,8 +74,9 @@ use std::default::Default;
use std::ffi::CString;
use std::mem as std_mem;
use std::rc::Rc;
use std::sync::mpsc::{channel, Receiver};
use std::sync::Arc;
use std::sync::mpsc::TryRecvError::{Empty, Disconnected};
use std::sync::mpsc::{channel, Receiver};
use time;
/// Current state of the window object
@ -173,7 +174,7 @@ pub struct Window {
window_size: Cell<Option<WindowSizeData>>,
/// Associated resource task for use by DOM objects like XMLHttpRequest
resource_task: ResourceTask,
resource_task: Arc<ResourceTask>,
/// A handle for communicating messages to the storage task.
storage_task: StorageTask,
@ -883,7 +884,7 @@ impl<'a> WindowHelpers for &'a Window {
}
fn resource_task(self) -> ResourceTask {
self.resource_task.clone()
(*self.resource_task).clone()
}
fn mem_profiler_chan(self) -> mem::ProfilerChan {
@ -1035,7 +1036,7 @@ impl Window {
control_chan: ScriptControlChan,
compositor: ScriptListener,
image_cache_task: ImageCacheTask,
resource_task: ResourceTask,
resource_task: Arc<ResourceTask>,
storage_task: StorageTask,
mem_profiler_chan: mem::ProfilerChan,
devtools_chan: Option<IpcSender<ScriptToDevtoolsControlMsg>>,