diff options
| author | Ms2ger <ms2ger@gmail.com> | 2014-10-04 13:02:02 +0200 |
|---|---|---|
| committer | Ms2ger <ms2ger@gmail.com> | 2014-10-04 13:14:23 +0200 |
| commit | 208afda890515731f8c92a15b9e49a53ca3bcd35 (patch) | |
| tree | 442d6298c04b29412a3f8af9201086e33be22b88 /components/script/script_task.rs | |
| parent | d23e45fe5db54994f4f3569f8bda1ec5a6121610 (diff) | |
| download | servo-208afda890515731f8c92a15b9e49a53ca3bcd35.tar.gz servo-208afda890515731f8c92a15b9e49a53ca3bcd35.zip | |
Stop reference-counting the ScriptTask.
The ScriptTask is owned by the proc in ScriptTaskFactory::create.
We started using a managed box for what would eventually become ScriptTask in
d21d27e08633b6a7f2b774a28c65c81d1eedbeaf.
Diffstat (limited to 'components/script/script_task.rs')
| -rw-r--r-- | components/script/script_task.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs index f6a0fdb332b..95b75712a6f 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -267,7 +267,7 @@ impl ScriptTaskFactory for ScriptTask { image_cache_task, devtools_chan, window_size); - let mut failsafe = ScriptMemoryFailsafe::new(&*script_task); + let mut failsafe = ScriptMemoryFailsafe::new(&script_task); script_task.start(); // This must always be the very last operation performed before the task completes @@ -290,7 +290,7 @@ impl ScriptTask { img_cache_task: ImageCacheTask, devtools_chan: Option<DevtoolsControlChan>, window_size: WindowSizeData) - -> Rc<ScriptTask> { + -> ScriptTask { let (js_runtime, js_context) = ScriptTask::new_rt_and_cx(); unsafe { // JS_SetWrapObjectCallbacks clobbers the existing wrap callback, @@ -319,7 +319,7 @@ impl ScriptTask { chan.send(NewGlobal(id, devtools_sender.clone())); }); - Rc::new(ScriptTask { + ScriptTask { page: RefCell::new(Rc::new(page)), image_cache_task: img_cache_task, @@ -337,7 +337,7 @@ impl ScriptTask { js_runtime: js_runtime, js_context: RefCell::new(Some(js_context)), mouse_over_targets: RefCell::new(None) - }) + } } pub fn new_rt_and_cx() -> (js::rust::rt, Rc<Cx>) { |