diff options
author | Connor Brewster <brewsterc@my.caspercollege.edu> | 2016-05-05 22:45:08 -0600 |
---|---|---|
committer | Connor Brewster <brewsterc@my.caspercollege.edu> | 2016-05-11 12:46:59 -0600 |
commit | cbc5ca65a8fed0542a74b8917b5d8d6450714478 (patch) | |
tree | 6e72f1dddbe6a1a69d92720e2e13615818f52fd6 /components/script/dom/window.rs | |
parent | 392135bd0c2f512a0d632a7d76e667bc9af8f4a7 (diff) | |
download | servo-cbc5ca65a8fed0542a74b8917b5d8d6450714478.tar.gz servo-cbc5ca65a8fed0542a74b8917b5d8d6450714478.zip |
remove page and move functionality to browing context
Allow for adding history items
Fixed nested iframe test failure
Cleanup and small refactors
fixup
Diffstat (limited to 'components/script/dom/window.rs')
-rw-r--r-- | components/script/dom/window.rs | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index dc6fb8704e8..cb8f0c59639 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -51,7 +51,6 @@ use net_traits::bluetooth_thread::BluetoothMethodMsg; use net_traits::image_cache_thread::{ImageCacheChan, ImageCacheThread}; use net_traits::storage_thread::{StorageThread, StorageType}; use num_traits::ToPrimitive; -use page::Page; use profile_traits::mem; use reporter::CSSErrorReporter; use rustc_serialize::base64::{FromBase64, STANDARD, ToBase64}; @@ -151,7 +150,6 @@ pub struct Window { #[ignore_heap_size_of = "TODO(#6911) newtypes containing unmeasurable types are hard"] compositor: IpcSender<ScriptToCompositorMsg>, browsing_context: MutNullableHeap<JS<BrowsingContext>>, - page: Rc<Page>, performance: MutNullableHeap<JS<Performance>>, navigation_start: u64, navigation_start_precise: f64, @@ -337,10 +335,6 @@ impl Window { self.browsing_context.get().unwrap() } - pub fn page(&self) -> &Page { - &*self.page - } - pub fn bluetooth_thread(&self) -> IpcSender<BluetoothMethodMsg> { self.bluetooth_thread.clone() } @@ -1420,7 +1414,6 @@ impl Window { impl Window { pub fn new(runtime: Rc<Runtime>, - page: Rc<Page>, script_chan: MainThreadScriptChan, dom_task_source: DOMManipulationTaskSource, user_task_source: UserInteractionTaskSource, @@ -1467,7 +1460,6 @@ impl Window { console: Default::default(), crypto: Default::default(), compositor: compositor, - page: page, navigator: Default::default(), image_cache_thread: image_cache_thread, mem_profiler_chan: mem_profiler_chan, |