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

Auto merge of #5961 - Ms2ger:closeevent, r=jdm

Browse source 
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5961)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-05-06 09:51:31 -05:00
commit 9aa801f140
3 changed files with 28 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

52
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;
@ -13,26 +12,25 @@ use dom::bindings::js::{JSRef,Temporary, Rootable};
use dom::bindings::utils::reflect_dom_object; use dom::bindings::utils::reflect_dom_object;
use dom::event::{Event, EventTypeId, EventBubbles, EventCancelable}; use dom::event::{Event, EventTypeId, EventBubbles, EventCancelable};
use script_task::ScriptChan; use script_task::ScriptChan;
use std::borrow::ToOwned;
use std::cell::Cell;
use util::str::DOMString;
use util::str::DOMString;
#[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,
} }
} }
@ -43,47 +41,37 @@ 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,
type_: DOMString, type_: DOMString,
init: &CloseEventBinding::CloseEventInit) -> Fallible<Temporary<CloseEvent>> { init: &CloseEventBinding::CloseEventInit)
let clean_status = init.wasClean.unwrap_or(true); -> Fallible<Temporary<CloseEvent>> {
let cd = init.code.unwrap_or(0);
let rsn = match init.reason.as_ref() {
Some(reason) => reason.clone(),
None => "".to_owned(),
};
let bubbles = if init.parent.bubbles { EventBubbles::Bubbles } else { EventBubbles::DoesNotBubble }; let bubbles = if init.parent.bubbles { EventBubbles::Bubbles } else { EventBubbles::DoesNotBubble };
let cancelable = if init.parent.cancelable { EventCancelable::Cancelable } else { EventCancelable::NotCancelable }; let cancelable = if init.parent.cancelable { EventCancelable::Cancelable } else { EventCancelable::NotCancelable };
Ok(CloseEvent::new(global, type_, bubbles, cancelable, clean_status, cd, rsn)) Ok(CloseEvent::new(global, type_, bubbles, cancelable, init.wasClean,
init.code, init.reason.clone()))
} }
} }
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()
} }
} }

6
components/script/dom/webidls/CloseEvent.webidl
View file

@ -11,7 +11,7 @@ interface CloseEvent : Event {
}; };
dictionary CloseEventInit : EventInit { dictionary CloseEventInit : EventInit {
boolean wasClean; boolean wasClean = false;
unsigned short code; unsigned short code = 0;
DOMString reason; DOMString reason = "";
}; };

5
tests/wpt/metadata/websockets/interfaces/CloseEvent/constructor.html.ini
View file

@ -1,5 +0,0 @@
[constructor.html]
type: testharness
[new CloseEvent() without dictionary]
expected: FAIL