diff options
Diffstat (limited to 'components/script/dom')
| -rw-r--r-- | components/script/dom/bindings/global.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/window.rs | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/components/script/dom/bindings/global.rs b/components/script/dom/bindings/global.rs index 5f0f7668af4..cfdd3df4af5 100644 --- a/components/script/dom/bindings/global.rs +++ b/components/script/dom/bindings/global.rs @@ -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(), } diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index d4f2a36eabf..d7a9e9f243a 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -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>>, |