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

Remove JSPageInfo::js_compartment.

Browse source 
A js::rust::Compartment is little more than a glorified pointer to the
reflector of a window, so there's no good reason to use it. Instead, this
commit passes a JS<Window> directly when it's necessary.

This also means that we now have to use JS_DefineFunctions rather than
Compartment::define_functions; I believe the former is clearer to the reader
than the extra indirection involved in the latter calling through three
reopsitories.

This commit also simplifies ScriptTask::load to reuse the 'cx' local that is
in scope already, rather than refetching it through js_info.
This commit is contained in:
Ms2ger 2014-04-21 13:43:13 +02:00
parent bb8a037cb2
commit 4f9e119334
3 changed files with 31 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/script/dom/window.rs
View file

@ -20,7 +20,7 @@ use servo_net::image_cache_task::ImageCacheTask;
use servo_util::str::DOMString;
use servo_util::task::{spawn_named};
use js::jsapi::{JSObject, JSContext, JS_DefineProperty, JS_PropertyStub, JS_StrictPropertyStub};
use js::jsapi::{JSContext, JS_DefineProperty, JS_PropertyStub, JS_StrictPropertyStub};
use js::jsval::{NullValue, ObjectValue, JSVal};
use js::JSPROP_ENUMERATE;
@ -91,9 +91,9 @@ pub struct Window {
}
impl Window {
pub fn get_cx(&self) -> *JSObject {
pub fn get_cx(&self) -> *JSContext {
let js_info = self.page().js_info();
js_info.get_ref().js_compartment.deref().cx.deref().ptr
(**js_info.get_ref().js_context).ptr
}
pub fn page<'a>(&'a self) -> &'a Page {