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

Side by Side Diff: third_party/WebKit/Source/core/input/PointerEventManager.cpp

Issue 2671933002: Migrate WTF::HashMap::add() to ::insert() (Closed)
Patch Set: rebase, add TODOs Created 3 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/input/PointerEventManager.h" 5 #include "core/input/PointerEventManager.h"
6 6
7 #include "core/dom/DocumentUserGestureToken.h" 7 #include "core/dom/DocumentUserGestureToken.h"
8 #include "core/dom/ElementTraversal.h" 8 #include "core/dom/ElementTraversal.h"
9 #include "core/dom/shadow/FlatTreeTraversal.h" 9 #include "core/dom/shadow/FlatTreeTraversal.h"
10 #include "core/events/MouseEvent.h" 10 #include "core/events/MouseEvent.h"
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 m_nodeUnderPointer.get(pointerEvent->pointerId()); 218 m_nodeUnderPointer.get(pointerEvent->pointerId());
219 if (!target) { 219 if (!target) {
220 m_nodeUnderPointer.erase(pointerEvent->pointerId()); 220 m_nodeUnderPointer.erase(pointerEvent->pointerId());
221 } else if (target != 221 } else if (target !=
222 m_nodeUnderPointer.get(pointerEvent->pointerId()).target) { 222 m_nodeUnderPointer.get(pointerEvent->pointerId()).target) {
223 m_nodeUnderPointer.set(pointerEvent->pointerId(), 223 m_nodeUnderPointer.set(pointerEvent->pointerId(),
224 EventTargetAttributes(target, false)); 224 EventTargetAttributes(target, false));
225 } 225 }
226 sendBoundaryEvents(node.target, target, pointerEvent); 226 sendBoundaryEvents(node.target, target, pointerEvent);
227 } else if (target) { 227 } else if (target) {
228 m_nodeUnderPointer.add(pointerEvent->pointerId(), 228 m_nodeUnderPointer.insert(pointerEvent->pointerId(),
229 EventTargetAttributes(target, false)); 229 EventTargetAttributes(target, false));
230 sendBoundaryEvents(nullptr, target, pointerEvent); 230 sendBoundaryEvents(nullptr, target, pointerEvent);
231 } 231 }
232 } 232 }
233 233
234 void PointerEventManager::blockTouchPointers() { 234 void PointerEventManager::blockTouchPointers() {
235 if (m_inCanceledStateForPointerTypeTouch) 235 if (m_inCanceledStateForPointerTypeTouch)
236 return; 236 return;
237 m_inCanceledStateForPointerTypeTouch = true; 237 m_inCanceledStateForPointerTypeTouch = true;
238 238
239 Vector<int> touchPointerIds = m_pointerEventFactory.getPointerIdsOfType( 239 Vector<int> touchPointerIds = m_pointerEventFactory.getPointerIdsOfType(
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
698 if (firstId > uniqueTouchEventId) 698 if (firstId > uniqueTouchEventId)
699 return false; 699 return false;
700 m_touchIdsForCanceledPointerdowns.takeFirst(); 700 m_touchIdsForCanceledPointerdowns.takeFirst();
701 if (firstId == uniqueTouchEventId) 701 if (firstId == uniqueTouchEventId)
702 return true; 702 return true;
703 } 703 }
704 return false; 704 return false;
705 } 705 }
706 706
707 } // namespace blink 707 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698