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

Make the CloseEvent members immutable.

Browse source
This commit is contained in:
Ms2ger 2015-05-06 11:27:54 +02:00
parent 31ebfff9bc
commit 692fc09041
1 changed files with 15 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

37
components/script/dom/closeevent.rs
View file

@ -2,7 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use dom::bindings::cell::DOMRefCell;
use dom::bindings::codegen::Bindings::EventBinding::EventMethods; use dom::bindings::codegen::Bindings::EventBinding::EventMethods;
use dom::bindings::codegen::Bindings::CloseEventBinding; use dom::bindings::codegen::Bindings::CloseEventBinding;
use dom::bindings::codegen::Bindings::CloseEventBinding::CloseEventMethods; use dom::bindings::codegen::Bindings::CloseEventBinding::CloseEventMethods;
@ -17,23 +16,23 @@ use script_task::ScriptChan;
use util::str::DOMString; use util::str::DOMString;
use std::borrow::ToOwned; use std::borrow::ToOwned;
use std::cell::Cell;
#[dom_struct] #[dom_struct]
pub struct CloseEvent { pub struct CloseEvent {
event: Event, event: Event,
wasClean: Cell<bool>, wasClean: bool,
code: Cell<u16>, code: u16,
reason: DOMRefCell<DOMString> reason: DOMString,
} }
impl CloseEvent { impl CloseEvent {
pub fn new_inherited(type_id: EventTypeId) -> CloseEvent { pub fn new_inherited(type_id: EventTypeId, wasClean: bool, code: u16,
reason: DOMString) -> CloseEvent {
CloseEvent { CloseEvent {
event: Event::new_inherited(type_id), event: Event::new_inherited(type_id),
wasClean: Cell::new(true), wasClean: wasClean,
code: Cell::new(0), code: code,
reason: DOMRefCell::new("".to_owned()) reason: reason,
} }
} }
@ -44,19 +43,14 @@ impl CloseEvent {
wasClean: bool, wasClean: bool,
code: u16, code: u16,
reason: DOMString) -> Temporary<CloseEvent> { reason: DOMString) -> Temporary<CloseEvent> {
let ev = reflect_dom_object(box CloseEvent::new_inherited(EventTypeId::CloseEvent), let event = box CloseEvent::new_inherited(EventTypeId::CloseEvent,
global, wasClean, code, reason);
CloseEventBinding::Wrap); let ev = reflect_dom_object(event, global, CloseEventBinding::Wrap).root();
let ev = ev.root();
let event: JSRef<Event> = EventCast::from_ref(ev.r()); let event: JSRef<Event> = EventCast::from_ref(ev.r());
event.InitEvent(type_, event.InitEvent(type_,
bubbles == EventBubbles::Bubbles, bubbles == EventBubbles::Bubbles,
cancelable == EventCancelable::Cancelable); cancelable == EventCancelable::Cancelable);
let ev = ev.r(); Temporary::from_rooted(ev.r())
ev.wasClean.set(wasClean);
ev.code.set(code);
*ev.reason.borrow_mut() = reason;
Temporary::from_rooted(ev)
} }
pub fn Constructor(global: GlobalRef, pub fn Constructor(global: GlobalRef,
@ -77,15 +71,14 @@ impl CloseEvent {
impl<'a> CloseEventMethods for JSRef<'a, CloseEvent> { impl<'a> CloseEventMethods for JSRef<'a, CloseEvent> {
fn WasClean(self) -> bool { fn WasClean(self) -> bool {
self.wasClean.get() self.wasClean
} }
fn Code(self) -> u16 { fn Code(self) -> u16 {
self.code.get() self.code
} }
fn Reason(self) -> DOMString { fn Reason(self) -> DOMString {
let reason = self.reason.borrow(); self.reason.clone()
reason.clone()
} }
} }