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

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, 7 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 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 ReleasePointerCapture(pointer_event->pointerId()); 516 ReleasePointerCapture(pointer_event->pointerId());
517 // Send got/lostpointercapture rightaway if necessary. 517 // Send got/lostpointercapture rightaway if necessary.
518 ProcessPendingPointerCapture(pointer_event); 518 ProcessPendingPointerCapture(pointer_event);
519 519
520 if (pointer_event->isPrimary()) { 520 if (pointer_event->isPrimary()) {
521 prevent_mouse_event_for_pointer_type_[ToPointerTypeIndex( 521 prevent_mouse_event_for_pointer_type_[ToPointerTypeIndex(
522 mouse_event.pointer_type)] = false; 522 mouse_event.pointer_type)] = false;
523 } 523 }
524 } 524 }
525 525
526 if (mouse_event.GetType() == WebInputEvent::kMouseLeave &&
527 mouse_event.pointer_type == WebPointerProperties::PointerType::kPen) {
528 pointer_event_factory_.Remove(pointer_event->pointerId());
529 }
526 return result; 530 return result;
527 } 531 }
528 532
529 bool PointerEventManager::GetPointerCaptureState( 533 bool PointerEventManager::GetPointerCaptureState(
530 int pointer_id, 534 int pointer_id,
531 EventTarget** pointer_capture_target, 535 EventTarget** pointer_capture_target,
532 EventTarget** pending_pointer_capture_target) { 536 EventTarget** pending_pointer_capture_target) {
533 PointerCapturingMap::const_iterator it; 537 PointerCapturingMap::const_iterator it;
534 538
535 it = pointer_capture_target_.find(pointer_id); 539 it = pointer_capture_target_.find(pointer_id);
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
716 if (first_id > unique_touch_event_id) 720 if (first_id > unique_touch_event_id)
717 return false; 721 return false;
718 touch_ids_for_canceled_pointerdowns_.TakeFirst(); 722 touch_ids_for_canceled_pointerdowns_.TakeFirst();
719 if (first_id == unique_touch_event_id) 723 if (first_id == unique_touch_event_id)
720 return true; 724 return true;
721 } 725 }
722 return false; 726 return false;
723 } 727 }
724 728
725 } // namespace blink 729 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/external/wpt_automation/pointerevents/pointerevent_pointerleave_pen-manual-automation.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698