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

Remove the DOMRefCell wrapper around Window::compositor.

Browse source
This commit is contained in:
wartman4404 2015-08-16 17:28:21 -05:00
parent e74825f9fd
commit 8d665008f8
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/script/dom/window.rs
View file

@ -68,7 +68,7 @@ use libc;
use rustc_serialize::base64::{FromBase64, ToBase64, STANDARD}; use rustc_serialize::base64::{FromBase64, ToBase64, STANDARD};
use std::ascii::AsciiExt; use std::ascii::AsciiExt;
use std::borrow::ToOwned; use std::borrow::ToOwned;
use std::cell::{Cell, Ref, RefMut, RefCell}; use std::cell::{Cell, Ref, RefCell};
use std::collections::HashSet; use std::collections::HashSet;
use std::default::Default; use std::default::Default;
use std::ffi::CString; use std::ffi::CString;
@ -121,7 +121,7 @@ pub struct Window {
#[ignore_heap_size_of = "channels are hard"] #[ignore_heap_size_of = "channels are hard"]
image_cache_chan: ImageCacheChan, image_cache_chan: ImageCacheChan,
#[ignore_heap_size_of = "TODO(#6911) newtypes containing unmeasurable types are hard"] #[ignore_heap_size_of = "TODO(#6911) newtypes containing unmeasurable types are hard"]
compositor: DOMRefCell<IpcSender<ScriptToCompositorMsg>>, compositor: IpcSender<ScriptToCompositorMsg>,
browsing_context: DOMRefCell<Option<BrowsingContext>>, browsing_context: DOMRefCell<Option<BrowsingContext>>,
page: Rc<Page>, page: Rc<Page>,
performance: MutNullableHeap<JS<Performance>>, performance: MutNullableHeap<JS<Performance>>,
@ -273,8 +273,8 @@ impl Window {
&self.image_cache_task &self.image_cache_task
} }
pub fn compositor<'a>(&'a self) -> RefMut<'a, IpcSender<ScriptToCompositorMsg>> { pub fn compositor<'a>(&'a self) -> &'a IpcSender<ScriptToCompositorMsg> {
self.compositor.borrow_mut() &self.compositor
} }
pub fn browsing_context<'a>(&'a self) -> Ref<'a, Option<BrowsingContext>> { pub fn browsing_context<'a>(&'a self) -> Ref<'a, Option<BrowsingContext>> {
@ -1099,7 +1099,7 @@ impl Window {
control_chan: control_chan, control_chan: control_chan,
console: Default::default(), console: Default::default(),
crypto: Default::default(), crypto: Default::default(),
compositor: DOMRefCell::new(compositor), compositor: compositor,
page: page, page: page,
navigator: Default::default(), navigator: Default::default(),
image_cache_task: image_cache_task, image_cache_task: image_cache_task,