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

Side by Side Diff: third_party/WebKit/Source/core/events/MouseEvent.cpp

Issue 2030513002: Remove Event.relatedTargetScoped and update event path calculation for relatedTarget (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed Created 4 years, 6 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 /* 1 /*
2 * Copyright (C) 2001 Peter Kelly (pmk@post.com) 2 * Copyright (C) 2001 Peter Kelly (pmk@post.com)
3 * Copyright (C) 2001 Tobias Anton (anton@stud.fbi.fh-darmstadt.de) 3 * Copyright (C) 2001 Tobias Anton (anton@stud.fbi.fh-darmstadt.de)
4 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 4 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
5 * Copyright (C) 2003, 2005, 2006, 2008 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2008 Apple Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 112
113 MouseEvent::MouseEvent(const AtomicString& eventType, bool canBubble, bool cance lable, AbstractView* view, 113 MouseEvent::MouseEvent(const AtomicString& eventType, bool canBubble, bool cance lable, AbstractView* view,
114 int detail, int screenX, int screenY, int windowX, int windowY, 114 int detail, int screenX, int screenY, int windowX, int windowY,
115 int movementX, int movementY, 115 int movementX, int movementY,
116 PlatformEvent::Modifiers modifiers, 116 PlatformEvent::Modifiers modifiers,
117 short button, unsigned short buttons, 117 short button, unsigned short buttons,
118 EventTarget* relatedTarget, 118 EventTarget* relatedTarget,
119 double platformTimeStamp, 119 double platformTimeStamp,
120 PlatformMouseEvent::SyntheticEventType syntheticEventType, 120 PlatformMouseEvent::SyntheticEventType syntheticEventType,
121 const String& region) 121 const String& region)
122 : MouseRelatedEvent(eventType, canBubble, cancelable, relatedTarget, view, d etail, IntPoint(screenX, screenY), 122 : MouseRelatedEvent(eventType, canBubble, cancelable, view, detail, IntPoint (screenX, screenY),
123 IntPoint(windowX, windowY), IntPoint(movementX, movementY), modifiers, 123 IntPoint(windowX, windowY), IntPoint(movementX, movementY), modifiers,
124 platformTimeStamp, 124 platformTimeStamp,
125 syntheticEventType == PlatformMouseEvent::Positionless ? PositionType::P ositionless : PositionType::Position, 125 syntheticEventType == PlatformMouseEvent::Positionless ? PositionType::P ositionless : PositionType::Position,
126 syntheticEventType == PlatformMouseEvent::FromTouch ? InputDeviceCapabil ities::firesTouchEventsSourceCapabilities() : InputDeviceCapabilities::doesntFir eTouchEventsSourceCapabilities()) 126 syntheticEventType == PlatformMouseEvent::FromTouch ? InputDeviceCapabil ities::firesTouchEventsSourceCapabilities() : InputDeviceCapabilities::doesntFir eTouchEventsSourceCapabilities())
127 , m_button(button) 127 , m_button(button)
128 , m_buttons(buttons) 128 , m_buttons(buttons)
129 , m_relatedTarget(relatedTarget) 129 , m_relatedTarget(relatedTarget)
130 , m_syntheticEventType(syntheticEventType) 130 , m_syntheticEventType(syntheticEventType)
131 , m_region(region) 131 , m_region(region)
132 { 132 {
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 } 266 }
267 267
268 MouseEvent& MouseEventDispatchMediator::event() const 268 MouseEvent& MouseEventDispatchMediator::event() const
269 { 269 {
270 return toMouseEvent(EventDispatchMediator::event()); 270 return toMouseEvent(EventDispatchMediator::event());
271 } 271 }
272 272
273 DispatchEventResult MouseEventDispatchMediator::dispatchEvent(EventDispatcher& d ispatcher) const 273 DispatchEventResult MouseEventDispatchMediator::dispatchEvent(EventDispatcher& d ispatcher) const
274 { 274 {
275 MouseEvent& mouseEvent = event(); 275 MouseEvent& mouseEvent = event();
276 if (mouseEvent.relatedTargetScoped()) 276 mouseEvent.eventPath().adjustForRelatedTarget(dispatcher.node(), mouseEvent. relatedTarget());
277 mouseEvent.eventPath().adjustForRelatedTarget(dispatcher.node(), mouseEv ent.relatedTarget());
278 277
279 if (!mouseEvent.isTrusted()) 278 if (!mouseEvent.isTrusted())
280 return dispatcher.dispatch(); 279 return dispatcher.dispatch();
281 280
282 if (isDisabledFormControl(&dispatcher.node())) 281 if (isDisabledFormControl(&dispatcher.node()))
283 return DispatchEventResult::CanceledBeforeDispatch; 282 return DispatchEventResult::CanceledBeforeDispatch;
284 283
285 if (mouseEvent.type().isEmpty()) 284 if (mouseEvent.type().isEmpty())
286 return DispatchEventResult::NotCanceled; // Shouldn't happen. 285 return DispatchEventResult::NotCanceled; // Shouldn't happen.
287 286
(...skipping 22 matching lines...) Expand all
310 doubleClickEvent->setTrusted(mouseEvent.isTrusted()); 309 doubleClickEvent->setTrusted(mouseEvent.isTrusted());
311 if (mouseEvent.defaultHandled()) 310 if (mouseEvent.defaultHandled())
312 doubleClickEvent->setDefaultHandled(); 311 doubleClickEvent->setDefaultHandled();
313 DispatchEventResult doubleClickDispatchResult = EventDispatcher::dispatchEve nt(dispatcher.node(), MouseEventDispatchMediator::create(doubleClickEvent)); 312 DispatchEventResult doubleClickDispatchResult = EventDispatcher::dispatchEve nt(dispatcher.node(), MouseEventDispatchMediator::create(doubleClickEvent));
314 if (doubleClickDispatchResult != DispatchEventResult::NotCanceled) 313 if (doubleClickDispatchResult != DispatchEventResult::NotCanceled)
315 return doubleClickDispatchResult; 314 return doubleClickDispatchResult;
316 return dispatchResult; 315 return dispatchResult;
317 } 316 }
318 317
319 } // namespace blink 318 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698