mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
implement and use From<bool> for enum and back
implement and use From<bool> for EventBubbles (and back direction) implement and use From<bool> for EventCancelable (and back direction)
This commit is contained in:
parent
7a9dc57761
commit
0a5ac3b207
10 changed files with 68 additions and 78 deletions
|
@ -60,8 +60,8 @@ impl ErrorEvent {
|
|||
let ev = ErrorEvent::new_uninitialized(global);
|
||||
{
|
||||
let event = ev.upcast::<Event>();
|
||||
event.init_event(type_, bubbles == EventBubbles::Bubbles,
|
||||
cancelable == EventCancelable::Cancelable);
|
||||
event.init_event(type_, bool::from(bubbles),
|
||||
bool::from(cancelable));
|
||||
*ev.message.borrow_mut() = message;
|
||||
*ev.filename.borrow_mut() = filename;
|
||||
ev.lineno.set(lineno);
|
||||
|
@ -88,13 +88,9 @@ impl ErrorEvent {
|
|||
|
||||
let col_num = init.colno.unwrap_or(0);
|
||||
|
||||
let bubbles = if init.parent.bubbles { EventBubbles::Bubbles } else { EventBubbles::DoesNotBubble };
|
||||
let bubbles = EventBubbles::from(init.parent.bubbles);
|
||||
|
||||
let cancelable = if init.parent.cancelable {
|
||||
EventCancelable::Cancelable
|
||||
} else {
|
||||
EventCancelable::NotCancelable
|
||||
};
|
||||
let cancelable = EventCancelable::from(init.parent.cancelable);
|
||||
|
||||
// Dictionaries need to be rooted
|
||||
// https://github.com/servo/servo/issues/6381
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue