diff options
author | Patrick Walton <pcwalton@mimiga.net> | 2015-07-10 18:08:03 -0700 |
---|---|---|
committer | Patrick Walton <pcwalton@mimiga.net> | 2015-07-14 12:12:19 -0700 |
commit | e84106535175211526729e532058a7514a0de372 (patch) | |
tree | 40605bb1daa46f8ebffd5200756077c969656a9c /components/script/dom/window.rs | |
parent | 2947d78e4e0e7940b86e9fbdaa784ebbd28740f4 (diff) | |
download | servo-e84106535175211526729e532058a7514a0de372.tar.gz servo-e84106535175211526729e532058a7514a0de372.zip |
compositing: Move messages that go over the `ScriptListener` to go over
an IPC channel instead.
Because this used a boxed trait object to invoke messages across a
process boundary, and boxed trait objects are not supported across IPC,
we spawn a helper thread inside the compositor to perform the marshaling
for us.
Diffstat (limited to 'components/script/dom/window.rs')
-rw-r--r-- | components/script/dom/window.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index b781d7e19a1..984a8d4fb01 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -105,7 +105,7 @@ pub struct Window { navigator: MutNullableHeap<JS<Navigator>>, image_cache_task: ImageCacheTask, image_cache_chan: ImageCacheChan, - compositor: DOMRefCell<Box<ScriptListener+'static>>, + compositor: DOMRefCell<ScriptListener>, browser_context: DOMRefCell<Option<BrowserContext>>, page: Rc<Page>, performance: MutNullableHeap<JS<Performance>>, @@ -241,7 +241,7 @@ impl Window { &self.image_cache_task } - pub fn compositor<'a>(&'a self) -> RefMut<'a, Box<ScriptListener+'static>> { + pub fn compositor<'a>(&'a self) -> RefMut<'a, ScriptListener> { self.compositor.borrow_mut() } @@ -964,7 +964,7 @@ impl Window { script_chan: Box<ScriptChan+Send>, image_cache_chan: ImageCacheChan, control_chan: ScriptControlChan, - compositor: Box<ScriptListener+'static>, + compositor: ScriptListener, image_cache_task: ImageCacheTask, resource_task: ResourceTask, storage_task: StorageTask, |