Title: [153972] trunk/Source/WebCore
- Revision
- 153972
- Author
- [email protected]
- Date
- 2013-08-12 20:34:26 -0700 (Mon, 12 Aug 2013)
Log Message
Fix variable name |end| -> |size| in EventTarget::fireEventListeners
https://bugs.webkit.org/show_bug.cgi?id=119715
Reviewed by Benjamin Poulain.
Merge https://chromium.googlesource.com/chromium/blink/+/f58b017539c48059bb2b88d18ee0ee3d14decb01
and also fix variable names in FiringEventIterator.
* dom/EventTarget.cpp:
(WebCore::EventTarget::removeEventListener):
(WebCore::EventTarget::fireEventListeners):
(WebCore::EventTarget::removeAllEventListeners):
* dom/EventTarget.h:
(WebCore::FiringEventIterator::FiringEventIterator):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (153971 => 153972)
--- trunk/Source/WebCore/ChangeLog 2013-08-13 01:35:13 UTC (rev 153971)
+++ trunk/Source/WebCore/ChangeLog 2013-08-13 03:34:26 UTC (rev 153972)
@@ -1,3 +1,20 @@
+2013-08-13 Ryosuke Niwa <[email protected]>
+
+ Fix variable name |end| -> |size| in EventTarget::fireEventListeners
+ https://bugs.webkit.org/show_bug.cgi?id=119715
+
+ Reviewed by Benjamin Poulain.
+
+ Merge https://chromium.googlesource.com/chromium/blink/+/f58b017539c48059bb2b88d18ee0ee3d14decb01
+ and also fix variable names in FiringEventIterator.
+
+ * dom/EventTarget.cpp:
+ (WebCore::EventTarget::removeEventListener):
+ (WebCore::EventTarget::fireEventListeners):
+ (WebCore::EventTarget::removeAllEventListeners):
+ * dom/EventTarget.h:
+ (WebCore::FiringEventIterator::FiringEventIterator):
+
2013-08-12 Ryosuke Niwa <[email protected]>
Encapsulate access to documentNamedItemMap and windowNamedItemMap
Modified: trunk/Source/WebCore/dom/EventTarget.cpp (153971 => 153972)
--- trunk/Source/WebCore/dom/EventTarget.cpp 2013-08-13 01:35:13 UTC (rev 153971)
+++ trunk/Source/WebCore/dom/EventTarget.cpp 2013-08-13 03:34:26 UTC (rev 153972)
@@ -92,10 +92,10 @@
if (eventType != firingIterator.eventType)
continue;
- if (indexOfRemovedListener >= firingIterator.end)
+ if (indexOfRemovedListener >= firingIterator.size)
continue;
- --firingIterator.end;
+ --firingIterator.size;
if (indexOfRemovedListener <= firingIterator.iterator)
--firingIterator.iterator;
}
@@ -217,18 +217,17 @@
{
RefPtr<EventTarget> protect = this;
- // Fire all listeners registered for this event. Don't fire listeners removed
- // during event dispatch. Also, don't fire event listeners added during event
- // dispatch. Conveniently, all new event listeners will be added after 'end',
- // so iterating to 'end' naturally excludes new event listeners.
+ // Fire all listeners registered for this event. Don't fire listeners removed during event dispatch.
+ // Also, don't fire event listeners added during event dispatch. Conveniently, all new event listeners will be added
+ // after or at index |size|, so iterating up to (but not including) |size| naturally excludes new event listeners.
bool userEventWasHandled = false;
size_t i = 0;
- size_t end = entry.size();
+ size_t size = entry.size();
if (!d->firingEventIterators)
d->firingEventIterators = adoptPtr(new FiringEventIteratorVector);
- d->firingEventIterators->append(FiringEventIterator(event->type(), i, end));
- for ( ; i < end; ++i) {
+ d->firingEventIterators->append(FiringEventIterator(event->type(), i, size));
+ for (; i < size; ++i) {
RegisteredEventListener& registeredListener = entry[i];
if (event->eventPhase() == Event::CAPTURING_PHASE && !registeredListener.useCapture)
continue;
@@ -286,7 +285,7 @@
if (d->firingEventIterators) {
for (size_t i = 0; i < d->firingEventIterators->size(); ++i) {
d->firingEventIterators->at(i).iterator = 0;
- d->firingEventIterators->at(i).end = 0;
+ d->firingEventIterators->at(i).size = 0;
}
}
}
Modified: trunk/Source/WebCore/dom/EventTarget.h (153971 => 153972)
--- trunk/Source/WebCore/dom/EventTarget.h 2013-08-13 01:35:13 UTC (rev 153971)
+++ trunk/Source/WebCore/dom/EventTarget.h 2013-08-13 03:34:26 UTC (rev 153972)
@@ -79,16 +79,16 @@
typedef int ExceptionCode;
struct FiringEventIterator {
- FiringEventIterator(const AtomicString& eventType, size_t& iterator, size_t& end)
+ FiringEventIterator(const AtomicString& eventType, size_t& iterator, size_t& size)
: eventType(eventType)
, iterator(iterator)
- , end(end)
+ , size(size)
{
}
const AtomicString& eventType;
size_t& iterator;
- size_t& end;
+ size_t& size;
};
typedef Vector<FiringEventIterator, 1> FiringEventIteratorVector;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes