Add more event names to atom list; use more atom macros.

This commit is contained in:
Corey Farwell 2016-11-06 11:03:14 -05:00
parent c62ce53efa
commit 54e490a3c8
4 changed files with 6 additions and 7 deletions

View file

@ -74,4 +74,6 @@ invalid
change change
open open
toggle toggle
statechange
controllerchange
fetch

View file

@ -18,7 +18,6 @@ use dom::globalscope::GlobalScope;
use js::jsapi::{HandleValue, JSContext}; use js::jsapi::{HandleValue, JSContext};
use script_thread::Runnable; use script_thread::Runnable;
use script_traits::{ScriptMsg, DOMMessage}; use script_traits::{ScriptMsg, DOMMessage};
use servo_atoms::Atom;
use std::cell::Cell; use std::cell::Cell;
use url::Url; use url::Url;
@ -62,7 +61,7 @@ impl ServiceWorker {
pub fn set_transition_state(&self, state: ServiceWorkerState) { pub fn set_transition_state(&self, state: ServiceWorkerState) {
self.state.set(state); self.state.set(state);
self.upcast::<EventTarget>().fire_event(Atom::from("statechange")); self.upcast::<EventTarget>().fire_event(atom!("statechange"));
} }
pub fn get_script_url(&self) -> Url { pub fn get_script_url(&self) -> Url {

View file

@ -15,7 +15,6 @@ use dom::promise::Promise;
use dom::serviceworker::ServiceWorker; use dom::serviceworker::ServiceWorker;
use dom::serviceworkerregistration::ServiceWorkerRegistration; use dom::serviceworkerregistration::ServiceWorkerRegistration;
use script_thread::ScriptThread; use script_thread::ScriptThread;
use servo_atoms::Atom;
use std::ascii::AsciiExt; use std::ascii::AsciiExt;
use std::default::Default; use std::default::Default;
use std::rc::Rc; use std::rc::Rc;
@ -46,7 +45,7 @@ pub trait Controllable {
impl Controllable for ServiceWorkerContainer { impl Controllable for ServiceWorkerContainer {
fn set_controller(&self, active_worker: &ServiceWorker) { fn set_controller(&self, active_worker: &ServiceWorker) {
self.controller.set(Some(active_worker)); self.controller.set(Some(active_worker));
self.upcast::<EventTarget>().fire_event(Atom::from("controllerchange")); self.upcast::<EventTarget>().fire_event(atom!("controllerchange"));
} }
} }

View file

@ -28,7 +28,6 @@ use net_traits::request::{CredentialsMode, Destination, RequestInit, Type as Req
use rand::random; use rand::random;
use script_runtime::{CommonScriptMsg, StackRootTLS, get_reports, new_rt_and_cx, ScriptChan}; use script_runtime::{CommonScriptMsg, StackRootTLS, get_reports, new_rt_and_cx, ScriptChan};
use script_traits::{TimerEvent, WorkerGlobalScopeInit, ScopeThings, ServiceWorkerMsg, WorkerScriptLoadOrigin}; use script_traits::{TimerEvent, WorkerGlobalScopeInit, ScopeThings, ServiceWorkerMsg, WorkerScriptLoadOrigin};
use servo_atoms::Atom;
use std::sync::mpsc::{Receiver, RecvError, Select, Sender, channel}; use std::sync::mpsc::{Receiver, RecvError, Select, Sender, channel};
use std::thread; use std::thread;
use std::time::Duration; use std::time::Duration;
@ -269,7 +268,7 @@ impl ServiceWorkerGlobalScope {
// TODO XXXcreativcoder This will eventually use a FetchEvent interface to fire event // TODO XXXcreativcoder This will eventually use a FetchEvent interface to fire event
// when we have the Request and Response dom api's implemented // when we have the Request and Response dom api's implemented
// https://slightlyoff.github.io/ServiceWorker/spec/service_worker_1/index.html#fetch-event-section // https://slightlyoff.github.io/ServiceWorker/spec/service_worker_1/index.html#fetch-event-section
self.upcast::<EventTarget>().fire_event(Atom::from("fetch")); self.upcast::<EventTarget>().fire_event(atom!("fetch"));
let _ = mediator.response_chan.send(None); let _ = mediator.response_chan.send(None);
} }
} }