mirror of
https://github.com/servo/servo.git
synced 2025-08-05 05:30:08 +01:00
Don't pass nullable strings to native DOM methods that want non-nullable strings. Fixes #1207.
This commit is contained in:
parent
803cd4b7cf
commit
08afc6d19d
75 changed files with 968 additions and 966 deletions
|
@ -3,7 +3,7 @@
|
|||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use dom::bindings::utils::{Reflectable, Reflector, DOMString, Fallible};
|
||||
use dom::bindings::utils::{null_str_as_word_null, InvalidState};
|
||||
use dom::bindings::utils::{InvalidState};
|
||||
use dom::bindings::codegen::EventListenerBinding::EventListener;
|
||||
use dom::document::AbstractDocument;
|
||||
use dom::event::AbstractEvent;
|
||||
|
@ -141,11 +141,11 @@ impl EventTarget {
|
|||
}
|
||||
|
||||
pub fn AddEventListener(&mut self,
|
||||
ty: &Option<DOMString>,
|
||||
ty: &DOMString,
|
||||
listener: Option<EventListener>,
|
||||
capture: bool) {
|
||||
for &listener in listener.iter() {
|
||||
let entry = self.handlers.find_or_insert_with(null_str_as_word_null(ty), |_| ~[]);
|
||||
let entry = self.handlers.find_or_insert_with(ty.clone(), |_| ~[]);
|
||||
let phase = if capture { Capturing } else { Bubbling };
|
||||
let new_entry = EventListenerEntry {
|
||||
phase: phase,
|
||||
|
@ -158,11 +158,11 @@ impl EventTarget {
|
|||
}
|
||||
|
||||
pub fn RemoveEventListener(&mut self,
|
||||
ty: &Option<DOMString>,
|
||||
ty: &DOMString,
|
||||
listener: Option<EventListener>,
|
||||
capture: bool) {
|
||||
for &listener in listener.iter() {
|
||||
let mut entry = self.handlers.find_mut(&null_str_as_word_null(ty));
|
||||
let mut entry = self.handlers.find_mut(ty);
|
||||
for entry in entry.mut_iter() {
|
||||
let phase = if capture { Capturing } else { Bubbling };
|
||||
let old_entry = EventListenerEntry {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue