Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Side by Side Diff: sky/engine/core/events/EventListenerMap.cpp

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « sky/engine/core/events/EventListenerMap.h ('k') | sky/engine/core/events/EventTarget.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 return 0; 169 return 0;
170 } 170 }
171 171
172 EventListenerIterator::EventListenerIterator() 172 EventListenerIterator::EventListenerIterator()
173 : m_map(0) 173 : m_map(0)
174 , m_entryIndex(0) 174 , m_entryIndex(0)
175 , m_index(0) 175 , m_index(0)
176 { 176 {
177 } 177 }
178 178
179 EventListenerIterator::EventListenerIterator(EventTarget* target) 179 EventListenerIterator::EventListenerIterator(const EventTarget* target)
180 : m_map(0) 180 : m_map(0)
181 , m_entryIndex(0) 181 , m_entryIndex(0)
182 , m_index(0) 182 , m_index(0)
183 { 183 {
184 ASSERT(target); 184 ASSERT(target);
185 EventTargetData* data = target->eventTargetData(); 185 EventTargetData* data = const_cast<EventTarget*>(target)->eventTargetData();
186 186
187 if (!data) 187 if (!data)
188 return; 188 return;
189 189
190 m_map = &data->eventListenerMap; 190 m_map = &data->eventListenerMap;
191 191
192 #if ENABLE(ASSERT) 192 #if ENABLE(ASSERT)
193 { 193 {
194 MutexLocker locker(activeIteratorCountMutex()); 194 MutexLocker locker(activeIteratorCountMutex());
195 m_map->m_activeIteratorCount++; 195 m_map->m_activeIteratorCount++;
(...skipping 20 matching lines...) Expand all
216 EventListenerVector& listeners = *m_map->m_entries[m_entryIndex].second; 216 EventListenerVector& listeners = *m_map->m_entries[m_entryIndex].second;
217 if (m_index < listeners.size()) 217 if (m_index < listeners.size())
218 return listeners[m_index++].listener.get(); 218 return listeners[m_index++].listener.get();
219 m_index = 0; 219 m_index = 0;
220 } 220 }
221 221
222 return 0; 222 return 0;
223 } 223 }
224 224
225 } // namespace blink 225 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/events/EventListenerMap.h ('k') | sky/engine/core/events/EventTarget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698