aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/script/dom/window.rs
diff options
context:
space:
mode:
authorTim Kuehn <tkuehn@cmu.edu>2013-06-26 22:42:01 -0700
committerTim Kuehn <tkuehn@cmu.edu>2013-07-01 11:03:31 -0700
commitfba7ec423c99a63bdcbe16029740e7ab4e38c088 (patch)
tree0e8a15014ee5bbf912153e8072c0a5505d3b4ecc /src/components/script/dom/window.rs
parentfdb0d820a49fac9ae2df623751912adcbe7a119d (diff)
downloadservo-fba7ec423c99a63bdcbe16029740e7ab4e38c088.tar.gz
servo-fba7ec423c99a63bdcbe16029740e7ab4e38c088.zip
add pipeline.rs, modularized pipelines communicating with constellation
Diffstat (limited to 'src/components/script/dom/window.rs')
-rw-r--r--src/components/script/dom/window.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs
index 5fb07c66f07..41f99eaa9e9 100644
--- a/src/components/script/dom/window.rs
+++ b/src/components/script/dom/window.rs
@@ -6,7 +6,7 @@ use dom::bindings::utils::WrapperCache;
use dom::bindings::window;
use layout_interface::ReflowForScriptQuery;
-use script_task::{ExitMsg, FireTimerMsg, ScriptChan, ScriptContext};
+use script_task::{ExitMsg, FireTimerMsg, ScriptChan, ScriptTask};
use std::comm;
use std::comm::Chan;
@@ -29,7 +29,7 @@ pub enum TimerControlMsg {
pub struct Window {
timer_chan: Chan<TimerControlMsg>,
script_chan: ScriptChan,
- script_context: *mut ScriptContext,
+ script_task: *mut ScriptTask,
wrapper: WrapperCache
}
@@ -89,11 +89,11 @@ impl Window {
pub fn content_changed(&self) {
unsafe {
- (*self.script_context).reflow_all(ReflowForScriptQuery)
+ (*self.script_task).reflow_all(ReflowForScriptQuery)
}
}
- pub fn new(script_chan: ScriptChan, script_context: *mut ScriptContext)
+ pub fn new(script_chan: ScriptChan, script_task: *mut ScriptTask)
-> @mut Window {
let script_chan_clone = script_chan.clone();
let win = @mut Window {
@@ -112,11 +112,11 @@ impl Window {
}
timer_chan
},
- script_context: script_context,
+ script_task: script_task,
};
unsafe {
- let compartment = (*script_context).js_compartment;
+ let compartment = (*script_task).js_compartment;
window::create(compartment, win);
}
win