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

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

Issue 1479923002: Enumerate the return value of dispatchEvent so it is clear. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master_passive_uma_add
Patch Set: Fix comments Created 4 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/shadow/FlatTreeTraversal.h" 7 #include "core/dom/shadow/FlatTreeTraversal.h"
8 #include "core/events/MouseEvent.h" 8 #include "core/events/MouseEvent.h"
9 #include "core/input/EventHandler.h" 9 #include "core/input/EventHandler.h"
10 10
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 WebInputEventResult dispatchPointerEvent( 60 WebInputEventResult dispatchPointerEvent(
61 PassRefPtrWillBeRawPtr<EventTarget> prpTarget, 61 PassRefPtrWillBeRawPtr<EventTarget> prpTarget,
62 PassRefPtrWillBeRawPtr<PointerEvent> prpPointerEvent, 62 PassRefPtrWillBeRawPtr<PointerEvent> prpPointerEvent,
63 bool checkForListener = false) 63 bool checkForListener = false)
64 { 64 {
65 RefPtrWillBeRawPtr<EventTarget> target = prpTarget; 65 RefPtrWillBeRawPtr<EventTarget> target = prpTarget;
66 RefPtrWillBeRawPtr<PointerEvent> pointerEvent = prpPointerEvent; 66 RefPtrWillBeRawPtr<PointerEvent> pointerEvent = prpPointerEvent;
67 if (!RuntimeEnabledFeatures::pointerEventEnabled()) 67 if (!RuntimeEnabledFeatures::pointerEventEnabled())
68 return WebInputEventResult::NotHandled; 68 return WebInputEventResult::NotHandled;
69 if (!checkForListener || target->hasEventListeners(pointerEvent->type())) { 69 if (!checkForListener || target->hasEventListeners(pointerEvent->type())) {
70 bool dispatchResult = target->dispatchEvent(pointerEvent); 70 DispatchEventResult dispatchResult = target->dispatchEvent(pointerEvent) ;
philipj_slow 2016/02/25 15:23:46 Like this :)
dtapuska 2016/02/25 22:06:10 Acknowledged.
71 return EventHandler::eventToEventResult(pointerEvent, dispatchResult); 71 return EventHandler::toWebInputEventResult(dispatchResult);
72 } 72 }
73 return WebInputEventResult::NotHandled; 73 return WebInputEventResult::NotHandled;
74 } 74 }
75 75
76 WebInputEventResult dispatchMouseEvent( 76 WebInputEventResult dispatchMouseEvent(
77 PassRefPtrWillBeRawPtr<EventTarget> prpTarget, 77 PassRefPtrWillBeRawPtr<EventTarget> prpTarget,
78 const AtomicString& mouseEventType, 78 const AtomicString& mouseEventType,
79 const PlatformMouseEvent& mouseEvent, 79 const PlatformMouseEvent& mouseEvent,
80 PassRefPtrWillBeRawPtr<EventTarget> prpRelatedTarget, 80 PassRefPtrWillBeRawPtr<EventTarget> prpRelatedTarget,
81 int detail = 0, 81 int detail = 0,
82 bool checkForListener = false) 82 bool checkForListener = false)
83 { 83 {
84 RefPtrWillBeRawPtr<EventTarget> target = prpTarget; 84 RefPtrWillBeRawPtr<EventTarget> target = prpTarget;
85 RefPtrWillBeRawPtr<EventTarget> relatedTarget = prpRelatedTarget; 85 RefPtrWillBeRawPtr<EventTarget> relatedTarget = prpRelatedTarget;
86 if (target->toNode() 86 if (target->toNode()
87 && (!checkForListener || target->hasEventListeners(mouseEventType))) { 87 && (!checkForListener || target->hasEventListeners(mouseEventType))) {
88 RefPtrWillBeRawPtr<Node> targetNode = target->toNode(); 88 RefPtrWillBeRawPtr<Node> targetNode = target->toNode();
89 RefPtrWillBeRawPtr<MouseEvent> event = MouseEvent::create(mouseEventType , 89 RefPtrWillBeRawPtr<MouseEvent> event = MouseEvent::create(mouseEventType ,
90 targetNode->document().domWindow(), mouseEvent, detail, 90 targetNode->document().domWindow(), mouseEvent, detail,
91 relatedTarget ? relatedTarget->toNode() : nullptr); 91 relatedTarget ? relatedTarget->toNode() : nullptr);
92 bool res = target->dispatchEvent(event); 92 DispatchEventResult res = target->dispatchEvent(event);
93 return EventHandler::eventToEventResult(event, res); 93 return EventHandler::toWebInputEventResult(res);
94 } 94 }
95 return WebInputEventResult::NotHandled; 95 return WebInputEventResult::NotHandled;
96 } 96 }
97 97
98 } // namespace 98 } // namespace
99 99
100 PassRefPtrWillBeRawPtr<Node> PointerEventManager::getEffectiveTargetForPointerEv ent( 100 PassRefPtrWillBeRawPtr<Node> PointerEventManager::getEffectiveTargetForPointerEv ent(
101 PassRefPtrWillBeRawPtr<Node> target, 101 PassRefPtrWillBeRawPtr<Node> target,
102 PassRefPtrWillBeRawPtr<PointerEvent> pointerEvent) 102 PassRefPtrWillBeRawPtr<PointerEvent> pointerEvent)
103 { 103 {
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 368
369 DEFINE_TRACE(PointerEventManager) 369 DEFINE_TRACE(PointerEventManager)
370 { 370 {
371 #if ENABLE(OILPAN) 371 #if ENABLE(OILPAN)
372 visitor->trace(m_nodeUnderPointer); 372 visitor->trace(m_nodeUnderPointer);
373 #endif 373 #endif
374 } 374 }
375 375
376 376
377 } // namespace blink 377 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698