diff options
| author | Tim Kuehn <tkuehn@cmu.edu> | 2013-09-21 15:37:30 -0400 |
|---|---|---|
| committer | Tim Kuehn <tkuehn@cmu.edu> | 2013-09-24 00:03:52 -0400 |
| commit | 99f125bb644db6eabef4ee282010db995be7d4eb (patch) | |
| tree | 77f01c4ba45f605236e80452563c571f0f5e008b /src/components/script/dom/window.rs | |
| parent | c56b015623ee6f78c1603dfe789418add7618289 (diff) | |
| download | servo-99f125bb644db6eabef4ee282010db995be7d4eb.tar.gz servo-99f125bb644db6eabef4ee282010db995be7d4eb.zip | |
script task only exits when the root pipeline exits
Diffstat (limited to 'src/components/script/dom/window.rs')
| -rw-r--r-- | src/components/script/dom/window.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/components/script/dom/window.rs b/src/components/script/dom/window.rs index 7c60da4d6c5..8b27b8862f1 100644 --- a/src/components/script/dom/window.rs +++ b/src/components/script/dom/window.rs @@ -212,7 +212,7 @@ impl Window { match timer_port.recv() { TimerMessage_Close => break, TimerMessage_Fire(td) => script_chan.send(FireTimerMsg(id, td)), - TimerMessage_TriggerExit => script_chan.send(ExitMsg), + TimerMessage_TriggerExit => script_chan.send(ExitMsg(id)), } } } @@ -225,7 +225,6 @@ impl Window { }; unsafe { - // TODO(tkuehn): This just grabs the top-level page. Need to handle subframes. let cache = ptr::to_unsafe_ptr(win.get_wrappercache()); win.wrap_object_shared(cx, ptr::null()); //XXXjdm proper scope let global = (*cache).wrapper; |