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

Side by Side Diff: Source/core/events/EventDispatcher.cpp

Issue 1251043004: Revert of Only execute default actions on trusted events. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master_event_trusted_main3
Patch Set: Created 5 years, 5 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * Copyright (C) 2011 Google Inc. All rights reserved. 8 * Copyright (C) 2011 Google Inc. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 196
197 inline void EventDispatcher::dispatchEventPostProcess(void* preDispatchEventHand lerResult) 197 inline void EventDispatcher::dispatchEventPostProcess(void* preDispatchEventHand lerResult)
198 { 198 {
199 m_event->setTarget(EventPath::eventTargetRespectingTargetRules(*m_node)); 199 m_event->setTarget(EventPath::eventTargetRespectingTargetRules(*m_node));
200 m_event->setCurrentTarget(0); 200 m_event->setCurrentTarget(0);
201 m_event->setEventPhase(0); 201 m_event->setEventPhase(0);
202 202
203 // Pass the data from the preDispatchEventHandler to the postDispatchEventHa ndler. 203 // Pass the data from the preDispatchEventHandler to the postDispatchEventHa ndler.
204 m_node->postDispatchEventHandler(m_event.get(), preDispatchEventHandlerResul t); 204 m_node->postDispatchEventHandler(m_event.get(), preDispatchEventHandlerResul t);
205 205
206 // The DOM Events spec says that events dispatched by JS (other than "click" )
207 // should not have their default handlers invoked.
208 bool isTrustedOrClick = !RuntimeEnabledFeatures::trustedEventsDefaultActionE nabled() || m_event->isTrusted() || (m_event->isMouseEvent() && toMouseEvent(*m_ event).type() == EventTypeNames::click);
209
210 // Call default event handlers. While the DOM does have a concept of prevent ing 206 // Call default event handlers. While the DOM does have a concept of prevent ing
211 // default handling, the detail of which handlers are called is an internal 207 // default handling, the detail of which handlers are called is an internal
212 // implementation detail and not part of the DOM. 208 // implementation detail and not part of the DOM.
213 if (!m_event->defaultPrevented() && !m_event->defaultHandled() && isTrustedO rClick) { 209 if (!m_event->defaultPrevented() && !m_event->defaultHandled()) {
214 // Non-bubbling events call only one default event handler, the one for the target. 210 // Non-bubbling events call only one default event handler, the one for the target.
215 m_node->willCallDefaultEventHandler(*m_event); 211 m_node->willCallDefaultEventHandler(*m_event);
216 m_node->defaultEventHandler(m_event.get()); 212 m_node->defaultEventHandler(m_event.get());
217 ASSERT(!m_event->defaultPrevented()); 213 ASSERT(!m_event->defaultPrevented());
218 if (m_event->defaultHandled()) 214 if (m_event->defaultHandled())
219 return; 215 return;
220 // For bubbling events, call default event handlers on the same targets in the 216 // For bubbling events, call default event handlers on the same targets in the
221 // same order as the bubbling phase. 217 // same order as the bubbling phase.
222 if (m_event->bubbles()) { 218 if (m_event->bubbles()) {
223 size_t size = m_event->eventPath().size(); 219 size_t size = m_event->eventPath().size();
224 for (size_t i = 1; i < size; ++i) { 220 for (size_t i = 1; i < size; ++i) {
225 m_event->eventPath()[i].node()->willCallDefaultEventHandler(*m_e vent); 221 m_event->eventPath()[i].node()->willCallDefaultEventHandler(*m_e vent);
226 m_event->eventPath()[i].node()->defaultEventHandler(m_event.get( )); 222 m_event->eventPath()[i].node()->defaultEventHandler(m_event.get( ));
227 ASSERT(!m_event->defaultPrevented()); 223 ASSERT(!m_event->defaultPrevented());
228 if (m_event->defaultHandled()) 224 if (m_event->defaultHandled())
229 return; 225 return;
230 } 226 }
231 } 227 }
232 } 228 }
233 } 229 }
234 230
235 } 231 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698