mirror of
https://github.com/servo/servo.git
synced 2025-08-05 13:40:08 +01:00
Update string_cache to 0.2.
Updated string_cache, html5ever, xml5ever and selectors in Cargo.toml files and Cargo.lock. Removed references to string_cache_plugin. Import atom! and ns! from string_cache. Replaced ns!("") by ns!(). Replaced ns!(XML) and co by ns!(xml) and co. Replaced atom!(foo) by atom!("foo"). Replaced Atom::from_slice by Atom::from. Replaced atom.as_slice() by &*atom.
This commit is contained in:
parent
e7b1924948
commit
3dec6edd10
68 changed files with 328 additions and 434 deletions
|
@ -309,7 +309,7 @@ impl EventTarget {
|
|||
let event_listener = listener.map(|listener|
|
||||
CommonEventHandler::EventHandler(
|
||||
EventHandlerNonNull::new(listener.callback())));
|
||||
self.set_inline_event_listener(Atom::from_slice(ty), event_listener);
|
||||
self.set_inline_event_listener(Atom::from(ty), event_listener);
|
||||
}
|
||||
|
||||
pub fn set_error_event_handler<T: CallbackContainer>(
|
||||
|
@ -318,11 +318,11 @@ impl EventTarget {
|
|||
let event_listener = listener.map(|listener|
|
||||
CommonEventHandler::ErrorEventHandler(
|
||||
OnErrorEventHandlerNonNull::new(listener.callback())));
|
||||
self.set_inline_event_listener(Atom::from_slice(ty), event_listener);
|
||||
self.set_inline_event_listener(Atom::from(ty), event_listener);
|
||||
}
|
||||
|
||||
pub fn get_event_handler_common<T: CallbackContainer>(&self, ty: &str) -> Option<Rc<T>> {
|
||||
let listener = self.get_inline_event_listener(&Atom::from_slice(ty));
|
||||
let listener = self.get_inline_event_listener(&Atom::from(ty));
|
||||
listener.map(|listener| CallbackContainer::new(listener.parent().callback()))
|
||||
}
|
||||
|
||||
|
@ -340,7 +340,7 @@ impl EventTargetMethods for EventTarget {
|
|||
match listener {
|
||||
Some(listener) => {
|
||||
let mut handlers = self.handlers.borrow_mut();
|
||||
let entry = match handlers.entry(Atom::from_slice(&ty)) {
|
||||
let entry = match handlers.entry(Atom::from(&*ty)) {
|
||||
Occupied(entry) => entry.into_mut(),
|
||||
Vacant(entry) => entry.insert(vec!()),
|
||||
};
|
||||
|
@ -366,7 +366,7 @@ impl EventTargetMethods for EventTarget {
|
|||
match listener {
|
||||
Some(ref listener) => {
|
||||
let mut handlers = self.handlers.borrow_mut();
|
||||
let entry = handlers.get_mut(&Atom::from_slice(&ty));
|
||||
let entry = handlers.get_mut(&Atom::from(&*ty));
|
||||
for entry in entry {
|
||||
let phase = if capture { ListenerPhase::Capturing } else { ListenerPhase::Bubbling };
|
||||
let old_entry = EventListenerEntry {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue