Move everything unrelated to the frame tree out of Page and into Document or Window. Reduce the API surface of Page to a bare minimum to allow for easier future removal.

This commit is contained in:
Josh Matthews 2015-02-19 13:08:50 -05:00
parent d9f04180a5
commit e2c4f5ed67
23 changed files with 664 additions and 672 deletions

View file

@ -4643,7 +4643,6 @@ class CGBindingRoot(CGThing):
'dom::bindings::proxyhandler::{fill_property_descriptor, get_expando_object}',
'dom::bindings::proxyhandler::{get_property_descriptor}',
'dom::bindings::str::ByteString',
'page::JSPageInfo',
'libc',
'util::str::DOMString',
'std::borrow::ToOwned',

View file

@ -11,7 +11,7 @@ use dom::bindings::conversions::FromJSValConvertible;
use dom::bindings::js::{JS, JSRef, Root, Unrooted};
use dom::bindings::utils::{Reflectable, Reflector};
use dom::workerglobalscope::{WorkerGlobalScope, WorkerGlobalScopeHelpers};
use dom::window;
use dom::window::{self, WindowHelpers};
use script_task::ScriptChan;
use net::resource_task::ResourceTask;
@ -84,7 +84,7 @@ impl<'a> GlobalRef<'a> {
/// Get the `ResourceTask` for this global scope.
pub fn resource_task(&self) -> ResourceTask {
match *self {
GlobalRef::Window(ref window) => window.page().resource_task.clone(),
GlobalRef::Window(ref window) => window.resource_task().clone(),
GlobalRef::Worker(ref worker) => worker.resource_task().clone(),
}
}

View file

@ -45,6 +45,8 @@ use js::JSFUN_CONSTRUCTOR;
use js;
/// Proxy handler for a WindowProxy.
#[allow(raw_pointer_derive)]
#[derive(Copy)]
pub struct WindowProxyHandler(pub *const libc::c_void);
#[allow(raw_pointer_derive)]