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

Pass a &GlobalScope to WebIDL static methods and constructors

Browse source
This commit is contained in:
Anthony Ramine 2016-10-04 00:54:05 +02:00
parent 1fd470889d
commit 19108aa330
56 changed files with 198 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/dom/eventsource.rs
View file

@ -6,7 +6,6 @@ use dom::bindings::cell::DOMRefCell;
use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull;
use dom::bindings::codegen::Bindings::EventSourceBinding::{EventSourceInit, EventSourceMethods, Wrap};
use dom::bindings::error::{Error, Fallible};
use dom::bindings::global::GlobalRef;
use dom::bindings::js::Root;
use dom::bindings::reflector::reflect_dom_object;
use dom::bindings::str::DOMString;
@ -49,18 +48,17 @@ impl EventSource {
Wrap)
}
pub fn Constructor(global: GlobalRef,
pub fn Constructor(global: &GlobalScope,
url_str: DOMString,
event_source_init: &EventSourceInit) -> Fallible<Root<EventSource>> {
let global_scope = global.as_global_scope();
// Steps 1-2
let base_url = global_scope.get_url();
let base_url = global.get_url();
let url = match base_url.join(&*url_str) {
Ok(u) => u,
Err(_) => return Err(Error::Syntax)
};
// Step 3
let event_source = EventSource::new(global_scope, url, event_source_init.withCredentials);
let event_source = EventSource::new(global, url, event_source_init.withCredentials);
// Step 4
// Step 5
// Step 6