auto merge of #4566 : mattnenterprise/servo/globalref-by-value, r=Ms2ger

This commit is contained in:
bors-servo 2015-01-08 13:12:55 -07:00
commit 7800d98728
25 changed files with 64 additions and 64 deletions

View file

@ -105,12 +105,12 @@ impl Event {
Temporary::from_rooted(event.r())
}
pub fn Constructor(global: &GlobalRef,
pub fn Constructor(global: GlobalRef,
type_: DOMString,
init: &EventBinding::EventInit) -> Fallible<Temporary<Event>> {
let bubbles = if init.bubbles { EventBubbles::Bubbles } else { EventBubbles::DoesNotBubble };
let cancelable = if init.cancelable { EventCancelable::Cancelable } else { EventCancelable::NotCancelable };
Ok(Event::new(*global, type_, bubbles, cancelable))
Ok(Event::new(global, type_, bubbles, cancelable))
}
#[inline]