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

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

Issue 2831933002: Make sure PointerEvents's isPrimary set correctly for stylus (Closed)
Patch Set: isprimary Created 3 years, 8 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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 EventTarget* target_under_pointer = 153 EventTarget* target_under_pointer =
154 node_under_pointer_.at(pointer_id).target; 154 node_under_pointer_.at(pointer_id).target;
155 if (target_under_pointer == target) { 155 if (target_under_pointer == target) {
156 node_under_pointer_.Set( 156 node_under_pointer_.Set(
157 pointer_id, 157 pointer_id,
158 EventTargetAttributes(target_under_pointer, 158 EventTargetAttributes(target_under_pointer,
159 event_type == EventTypeNames::pointerover)); 159 event_type == EventTypeNames::pointerover));
160 } 160 }
161 } 161 }
162 162
163 if (event_type == EventTypeNames::pointerleave)
dtapuska 2017/04/20 21:04:14 Do you want to do this after the pointerleave is d
Navid Zolghadr 2017/04/20 21:34:20 I don't think doing this here is correct. This wou
164 RemovePointer(pointer_event);
165
163 if (!RuntimeEnabledFeatures::pointerEventEnabled()) 166 if (!RuntimeEnabledFeatures::pointerEventEnabled())
164 return WebInputEventResult::kNotHandled; 167 return WebInputEventResult::kNotHandled;
165 if (!check_for_listener || target->HasEventListeners(event_type)) { 168 if (!check_for_listener || target->HasEventListeners(event_type)) {
166 UseCounter::Count(frame_, UseCounter::kPointerEventDispatch); 169 UseCounter::Count(frame_, UseCounter::kPointerEventDispatch);
167 if (event_type == EventTypeNames::pointerdown) 170 if (event_type == EventTypeNames::pointerdown)
168 UseCounter::Count(frame_, UseCounter::kPointerEventDispatchPointerDown); 171 UseCounter::Count(frame_, UseCounter::kPointerEventDispatchPointerDown);
169 172
170 DCHECK(!dispatching_pointer_id_); 173 DCHECK(!dispatching_pointer_id_);
171 AutoReset<int> dispatch_holder(&dispatching_pointer_id_, pointer_id); 174 AutoReset<int> dispatch_holder(&dispatching_pointer_id_, pointer_id);
172 DispatchEventResult dispatch_result = target->DispatchEvent(pointer_event); 175 DispatchEventResult dispatch_result = target->DispatchEvent(pointer_event);
(...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after
711 if (first_id > unique_touch_event_id) 714 if (first_id > unique_touch_event_id)
712 return false; 715 return false;
713 touch_ids_for_canceled_pointerdowns_.TakeFirst(); 716 touch_ids_for_canceled_pointerdowns_.TakeFirst();
714 if (first_id == unique_touch_event_id) 717 if (first_id == unique_touch_event_id)
715 return true; 718 return true;
716 } 719 }
717 return false; 720 return false;
718 } 721 }
719 722
720 } // namespace blink 723 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698