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

Use DOMRefCell for ScriptTask.

Browse source
This commit is contained in:
Tetsuharu OHZEKI 2014-10-21 02:22:38 +09:00
parent bf22a473fa
commit 072bb5b965
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/script/script_task.rs
View file

@ -5,6 +5,7 @@
//! The script task is the task that owns the DOM in memory, runs JavaScript, and spawns parsing //! The script task is the task that owns the DOM in memory, runs JavaScript, and spawns parsing
//! and layout tasks. //! and layout tasks.
use dom::bindings::cell::DOMRefCell;
use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods; use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods;
use dom::bindings::codegen::Bindings::DOMRectBinding::DOMRectMethods; use dom::bindings::codegen::Bindings::DOMRectBinding::DOMRectMethods;
use dom::bindings::codegen::Bindings::ElementBinding::ElementMethods; use dom::bindings::codegen::Bindings::ElementBinding::ElementMethods;
@ -64,7 +65,6 @@ use url::Url;
use libc::size_t; use libc::size_t;
use std::any::{Any, AnyRefExt}; use std::any::{Any, AnyRefExt};
use std::cell::RefCell;
use std::collections::HashSet; use std::collections::HashSet;
use std::comm::{channel, Sender, Receiver, Select}; use std::comm::{channel, Sender, Receiver, Select};
use std::mem::replace; use std::mem::replace;
@ -143,7 +143,7 @@ impl Drop for StackRootTLS {
/// FIXME: Rename to `Page`, following WebKit? /// FIXME: Rename to `Page`, following WebKit?
pub struct ScriptTask { pub struct ScriptTask {
/// A handle to the information pertaining to page layout /// A handle to the information pertaining to page layout
page: RefCell<Rc<Page>>, page: DOMRefCell<Rc<Page>>,
/// A handle to the image cache task. /// A handle to the image cache task.
image_cache_task: ImageCacheTask, image_cache_task: ImageCacheTask,
/// A handle to the resource task. /// A handle to the resource task.
@ -176,9 +176,9 @@ pub struct ScriptTask {
/// The JavaScript runtime. /// The JavaScript runtime.
js_runtime: js::rust::rt, js_runtime: js::rust::rt,
/// The JSContext. /// The JSContext.
js_context: RefCell<Option<Rc<Cx>>>, js_context: DOMRefCell<Option<Rc<Cx>>>,
mouse_over_targets: RefCell<Option<Vec<JS<Node>>>> mouse_over_targets: DOMRefCell<Option<Vec<JS<Node>>>>
} }
/// In the event of task failure, all data on the stack runs its destructor. However, there /// In the event of task failure, all data on the stack runs its destructor. However, there
@ -327,7 +327,7 @@ impl ScriptTask {
}); });
ScriptTask { ScriptTask {
page: RefCell::new(Rc::new(page)), page: DOMRefCell::new(Rc::new(page)),
image_cache_task: img_cache_task, image_cache_task: img_cache_task,
resource_task: resource_task, resource_task: resource_task,
@ -342,8 +342,8 @@ impl ScriptTask {
devtools_port: devtools_receiver, devtools_port: devtools_receiver,
js_runtime: js_runtime, js_runtime: js_runtime,
js_context: RefCell::new(Some(js_context)), js_context: DOMRefCell::new(Some(js_context)),
mouse_over_targets: RefCell::new(None) mouse_over_targets: DOMRefCell::new(None)
} }
} }