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

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

Issue 1925963002: InitEvent should not do anything if dispatch flag is set. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated as per review comments Created 4 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 /* 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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 } 174 }
175 ASSERT_NOT_REACHED(); 175 ASSERT_NOT_REACHED();
176 return 0; 176 return 0;
177 } 177 }
178 178
179 void MouseEvent::initMouseEvent(ScriptState* scriptState, const AtomicString& ty pe, bool canBubble, bool cancelable, AbstractView* view, 179 void MouseEvent::initMouseEvent(ScriptState* scriptState, const AtomicString& ty pe, bool canBubble, bool cancelable, AbstractView* view,
180 int detail, int screenX, int screenY, int client X, int clientY, 180 int detail, int screenX, int screenY, int client X, int clientY,
181 bool ctrlKey, bool altKey, bool shiftKey, bool m etaKey, 181 bool ctrlKey, bool altKey, bool shiftKey, bool m etaKey,
182 short button, EventTarget* relatedTarget, unsign ed short buttons) 182 short button, EventTarget* relatedTarget, unsign ed short buttons)
183 { 183 {
184 if (dispatched()) 184 if (isBeingDispatched())
185 return; 185 return;
186 186
187 if (scriptState && scriptState->world().isIsolatedWorld()) 187 if (scriptState && scriptState->world().isIsolatedWorld())
188 UIEventWithKeyState::didCreateEventInIsolatedWorld(ctrlKey, altKey, shif tKey, metaKey); 188 UIEventWithKeyState::didCreateEventInIsolatedWorld(ctrlKey, altKey, shif tKey, metaKey);
189 189
190 initModifiers(ctrlKey, altKey, shiftKey, metaKey); 190 initModifiers(ctrlKey, altKey, shiftKey, metaKey);
191 initMouseEventInternal(type, canBubble, cancelable, view, detail, screenX, s creenY, clientX, clientY, modifiers(), button, relatedTarget, nullptr, buttons); 191 initMouseEventInternal(type, canBubble, cancelable, view, detail, screenX, s creenY, clientX, clientY, modifiers(), button, relatedTarget, nullptr, buttons);
192 } 192 }
193 193
194 void MouseEvent::initMouseEventInternal(const AtomicString& type, bool canBubble , bool cancelable, AbstractView* view, 194 void MouseEvent::initMouseEventInternal(const AtomicString& type, bool canBubble , bool cancelable, AbstractView* view,
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 doubleClickEvent->setTrusted(mouseEvent.isTrusted()); 306 doubleClickEvent->setTrusted(mouseEvent.isTrusted());
307 if (mouseEvent.defaultHandled()) 307 if (mouseEvent.defaultHandled())
308 doubleClickEvent->setDefaultHandled(); 308 doubleClickEvent->setDefaultHandled();
309 DispatchEventResult doubleClickDispatchResult = EventDispatcher::dispatchEve nt(dispatcher.node(), MouseEventDispatchMediator::create(doubleClickEvent)); 309 DispatchEventResult doubleClickDispatchResult = EventDispatcher::dispatchEve nt(dispatcher.node(), MouseEventDispatchMediator::create(doubleClickEvent));
310 if (doubleClickDispatchResult != DispatchEventResult::NotCanceled) 310 if (doubleClickDispatchResult != DispatchEventResult::NotCanceled)
311 return doubleClickDispatchResult; 311 return doubleClickDispatchResult;
312 return dispatchResult; 312 return dispatchResult;
313 } 313 }
314 314
315 } // namespace blink 315 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/events/MessageEvent.cpp ('k') | third_party/WebKit/Source/core/events/MutationEvent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698