OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
4 * (C) 2001 Dirk Mueller (mueller@kde.org) | 4 * (C) 2001 Dirk Mueller (mueller@kde.org) |
5 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. | 5 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. |
6 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) | 6 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) |
7 * (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> | 7 * (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> |
8 * Copyright (C) 2011 Andreas Kling (kling@webkit.org) | 8 * Copyright (C) 2011 Andreas Kling (kling@webkit.org) |
9 * | 9 * |
10 * Redistribution and use in source and binary forms, with or without | 10 * Redistribution and use in source and binary forms, with or without |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 const RegisteredEventListener& eventListener) -> bool { | 142 const RegisteredEventListener& eventListener) -> bool { |
143 return eventListener.matches(listener, options); | 143 return eventListener.matches(listener, options); |
144 }); | 144 }); |
145 | 145 |
146 if (it == end) { | 146 if (it == end) { |
147 *indexOfRemovedListener = kNotFound; | 147 *indexOfRemovedListener = kNotFound; |
148 return false; | 148 return false; |
149 } | 149 } |
150 *registeredListener = *it; | 150 *registeredListener = *it; |
151 *indexOfRemovedListener = it - begin; | 151 *indexOfRemovedListener = it - begin; |
152 listenerVector->remove(*indexOfRemovedListener); | 152 listenerVector->erase(*indexOfRemovedListener); |
153 return true; | 153 return true; |
154 } | 154 } |
155 | 155 |
156 bool EventListenerMap::remove(const AtomicString& eventType, | 156 bool EventListenerMap::remove(const AtomicString& eventType, |
157 const EventListener* listener, | 157 const EventListener* listener, |
158 const EventListenerOptions& options, | 158 const EventListenerOptions& options, |
159 size_t* indexOfRemovedListener, | 159 size_t* indexOfRemovedListener, |
160 RegisteredEventListener* registeredListener) { | 160 RegisteredEventListener* registeredListener) { |
161 checkNoActiveIterators(); | 161 checkNoActiveIterators(); |
162 | 162 |
163 for (unsigned i = 0; i < m_entries.size(); ++i) { | 163 for (unsigned i = 0; i < m_entries.size(); ++i) { |
164 if (m_entries[i].first == eventType) { | 164 if (m_entries[i].first == eventType) { |
165 bool wasRemoved = | 165 bool wasRemoved = |
166 removeListenerFromVector(m_entries[i].second.get(), listener, options, | 166 removeListenerFromVector(m_entries[i].second.get(), listener, options, |
167 indexOfRemovedListener, registeredListener); | 167 indexOfRemovedListener, registeredListener); |
168 if (m_entries[i].second->isEmpty()) | 168 if (m_entries[i].second->isEmpty()) |
169 m_entries.remove(i); | 169 m_entries.erase(i); |
170 return wasRemoved; | 170 return wasRemoved; |
171 } | 171 } |
172 } | 172 } |
173 | 173 |
174 return false; | 174 return false; |
175 } | 175 } |
176 | 176 |
177 EventListenerVector* EventListenerMap::find(const AtomicString& eventType) { | 177 EventListenerVector* EventListenerMap::find(const AtomicString& eventType) { |
178 checkNoActiveIterators(); | 178 checkNoActiveIterators(); |
179 | 179 |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
246 EventListenerVector& listeners = *m_map->m_entries[m_entryIndex].second; | 246 EventListenerVector& listeners = *m_map->m_entries[m_entryIndex].second; |
247 if (m_index < listeners.size()) | 247 if (m_index < listeners.size()) |
248 return listeners[m_index++].listener(); | 248 return listeners[m_index++].listener(); |
249 m_index = 0; | 249 m_index = 0; |
250 } | 250 } |
251 | 251 |
252 return nullptr; | 252 return nullptr; |
253 } | 253 } |
254 | 254 |
255 } // namespace blink | 255 } // namespace blink |
OLD | NEW |