<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[209811] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/209811">209811</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2016-12-14 09:41:28 -0800 (Wed, 14 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>EventDispatcher::dispatchEvent() should take its Node by reference
https://bugs.webkit.org/show_bug.cgi?id=165840
Reviewed by Andreas Kling.
No new tests. No change in behavior.
* dom/Element.cpp:
(WebCore::Element::dispatchWheelEvent): Dereferenced |this| when calling
EventDispatcher::dispatchEvent().
(WebCore::Element::dispatchKeyEvent): Ditto.
(WebCore::Element::dispatchFocusEvent): Ditto.
(WebCore::Element::dispatchBlurEvent): Ditto.
* dom/EventDispatcher.cpp:
(WebCore::EventDispatcher::dispatchEvent): Changed |origin| from a Node* to a Node&, renamed
it to |node|, and protected it with a Ref called |protectedNode| to match our preferred
style.
* dom/EventDispatcher.h: Changed dispatchEvent's first parameter type from Node* to Node&.
* dom/Node.cpp:
(WebCore::Node::dispatchEvent): Dereferenced |this| when calling
EventDispatcher::dispatchEvent().
(WebCore::Node::dispatchTouchEvent): Ditto.
(WebCore::Node::dispatchUIRequestEvent): Ditto.
* dom/ScopedEventQueue.cpp:
(WebCore::ScopedEventQueue::dispatchEvent): Dereferenced |node| when calling
EventDispatcher::dispatchEvent().
* dom/SimulatedClick.cpp:
(WebCore::simulateMouseEvent): Passed |element| as a reference to
EventDispatcher::dispatchEvent().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomEventDispatchercpp">trunk/Source/WebCore/dom/EventDispatcher.cpp</a></li>
<li><a href="#trunkSourceWebCoredomEventDispatcherh">trunk/Source/WebCore/dom/EventDispatcher.h</a></li>
<li><a href="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScopedEventQueuecpp">trunk/Source/WebCore/dom/ScopedEventQueue.cpp</a></li>
<li><a href="#trunkSourceWebCoredomSimulatedClickcpp">trunk/Source/WebCore/dom/SimulatedClick.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209810 => 209811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-14 17:37:24 UTC (rev 209810)
+++ trunk/Source/WebCore/ChangeLog 2016-12-14 17:41:28 UTC (rev 209811)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-12-14 Andy Estes <aestes@apple.com>
+
+ EventDispatcher::dispatchEvent() should take its Node by reference
+ https://bugs.webkit.org/show_bug.cgi?id=165840
+
+ Reviewed by Andreas Kling.
+
+ No new tests. No change in behavior.
+
+ * dom/Element.cpp:
+ (WebCore::Element::dispatchWheelEvent): Dereferenced |this| when calling
+ EventDispatcher::dispatchEvent().
+ (WebCore::Element::dispatchKeyEvent): Ditto.
+ (WebCore::Element::dispatchFocusEvent): Ditto.
+ (WebCore::Element::dispatchBlurEvent): Ditto.
+ * dom/EventDispatcher.cpp:
+ (WebCore::EventDispatcher::dispatchEvent): Changed |origin| from a Node* to a Node&, renamed
+ it to |node|, and protected it with a Ref called |protectedNode| to match our preferred
+ style.
+ * dom/EventDispatcher.h: Changed dispatchEvent's first parameter type from Node* to Node&.
+ * dom/Node.cpp:
+ (WebCore::Node::dispatchEvent): Dereferenced |this| when calling
+ EventDispatcher::dispatchEvent().
+ (WebCore::Node::dispatchTouchEvent): Ditto.
+ (WebCore::Node::dispatchUIRequestEvent): Ditto.
+ * dom/ScopedEventQueue.cpp:
+ (WebCore::ScopedEventQueue::dispatchEvent): Dereferenced |node| when calling
+ EventDispatcher::dispatchEvent().
+ * dom/SimulatedClick.cpp:
+ (WebCore::simulateMouseEvent): Passed |element| as a reference to
+ EventDispatcher::dispatchEvent().
+
</ins><span class="cx"> 2016-12-14 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove Unicode case-insensitive matching for usemap=""
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (209810 => 209811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2016-12-14 17:37:24 UTC (rev 209810)
+++ trunk/Source/WebCore/dom/Element.cpp 2016-12-14 17:41:28 UTC (rev 209811)
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx"> if (!event.deltaX() && !event.deltaY())
</span><span class="cx"> wheelEvent->stopPropagation();
</span><span class="cx">
</span><del>- return EventDispatcher::dispatchEvent(this, wheelEvent) && !wheelEvent->defaultHandled();
</del><ins>+ return EventDispatcher::dispatchEvent(*this, wheelEvent) && !wheelEvent->defaultHandled();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Element::dispatchKeyEvent(const PlatformKeyboardEvent& platformEvent)
</span><span class="lines">@@ -327,7 +327,7 @@
</span><span class="cx"> if (frame->eventHandler().accessibilityPreventsEventPropogation(event))
</span><span class="cx"> event->stopPropagation();
</span><span class="cx"> }
</span><del>- return EventDispatcher::dispatchEvent(this, event) && !event->defaultHandled();
</del><ins>+ return EventDispatcher::dispatchEvent(*this, event) && !event->defaultHandled();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Element::dispatchSimulatedClick(Event* underlyingEvent, SimulatedClickMouseEventOptions eventOptions, SimulatedClickVisualOptions visualOptions)
</span><span class="lines">@@ -2465,7 +2465,7 @@
</span><span class="cx"> if (document().page())
</span><span class="cx"> document().page()->chrome().client().elementDidFocus(this);
</span><span class="cx">
</span><del>- EventDispatcher::dispatchEvent(this, FocusEvent::create(eventNames().focusEvent, false, false, document().defaultView(), 0, WTFMove(oldFocusedElement)));
</del><ins>+ EventDispatcher::dispatchEvent(*this, FocusEvent::create(eventNames().focusEvent, false, false, document().defaultView(), 0, WTFMove(oldFocusedElement)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Element::dispatchBlurEvent(RefPtr<Element>&& newFocusedElement)
</span><span class="lines">@@ -2473,7 +2473,7 @@
</span><span class="cx"> if (document().page())
</span><span class="cx"> document().page()->chrome().client().elementDidBlur(this);
</span><span class="cx">
</span><del>- EventDispatcher::dispatchEvent(this, FocusEvent::create(eventNames().blurEvent, false, false, document().defaultView(), 0, WTFMove(newFocusedElement)));
</del><ins>+ EventDispatcher::dispatchEvent(*this, FocusEvent::create(eventNames().blurEvent, false, false, document().defaultView(), 0, WTFMove(newFocusedElement)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Element::dispatchMouseForceWillBegin()
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventDispatchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventDispatcher.cpp (209810 => 209811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventDispatcher.cpp 2016-12-14 17:37:24 UTC (rev 209810)
+++ trunk/Source/WebCore/dom/EventDispatcher.cpp 2016-12-14 17:41:28 UTC (rev 209811)
</span><span class="lines">@@ -102,16 +102,15 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool EventDispatcher::dispatchEvent(Node* origin, Event& event)
</del><ins>+bool EventDispatcher::dispatchEvent(Node& node, Event& event)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(!NoEventDispatchAssertion::isEventDispatchForbidden());
</span><del>- ASSERT(origin);
- RefPtr<Node> node(origin);
- RefPtr<FrameView> view = node->document().view();
- EventPath eventPath(*node, event);
</del><ins>+ Ref<Node> protectedNode(node);
+ RefPtr<FrameView> view = node.document().view();
+ EventPath eventPath(node, event);
</ins><span class="cx">
</span><span class="cx"> if (EventTarget* relatedTarget = event.relatedTarget())
</span><del>- eventPath.setRelatedTarget(*node, *relatedTarget);
</del><ins>+ eventPath.setRelatedTarget(node, *relatedTarget);
</ins><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> if (is<TouchEvent>(event))
</span><span class="cx"> eventPath.retargetTouchLists(downcast<TouchEvent>(event));
</span><span class="lines">@@ -119,7 +118,7 @@
</span><span class="cx">
</span><span class="cx"> ChildNodesLazySnapshot::takeChildNodesLazySnapshot();
</span><span class="cx">
</span><del>- EventTarget* target = EventPath::eventTargetRespectingTargetRules(*node);
</del><ins>+ EventTarget* target = EventPath::eventTargetRespectingTargetRules(node);
</ins><span class="cx"> event.setTarget(target);
</span><span class="cx"> if (!event.target())
</span><span class="cx"> return true;
</span><span class="lines">@@ -127,8 +126,8 @@
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(!NoEventDispatchAssertion::isEventDispatchForbidden());
</span><span class="cx">
</span><span class="cx"> InputElementClickState clickHandlingState;
</span><del>- if (is<HTMLInputElement>(*node))
- downcast<HTMLInputElement>(*node).willDispatchEvent(event, clickHandlingState);
</del><ins>+ if (is<HTMLInputElement>(node))
+ downcast<HTMLInputElement>(node).willDispatchEvent(event, clickHandlingState);
</ins><span class="cx">
</span><span class="cx"> if (!event.propagationStopped() && !eventPath.isEmpty()) {
</span><span class="cx"> event.setEventPath(eventPath);
</span><span class="lines">@@ -137,13 +136,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto* finalTarget = event.target();
</span><del>- event.setTarget(EventPath::eventTargetRespectingTargetRules(*node));
</del><ins>+ event.setTarget(EventPath::eventTargetRespectingTargetRules(node));
</ins><span class="cx"> event.setCurrentTarget(nullptr);
</span><span class="cx"> event.resetPropagationFlags();
</span><span class="cx"> event.setEventPhase(Event::NONE);
</span><span class="cx">
</span><span class="cx"> if (clickHandlingState.stateful)
</span><del>- downcast<HTMLInputElement>(*node).didDispatchClickEvent(event, clickHandlingState);
</del><ins>+ downcast<HTMLInputElement>(node).didDispatchClickEvent(event, clickHandlingState);
</ins><span class="cx">
</span><span class="cx"> // Call default event handlers. While the DOM does have a concept of preventing
</span><span class="cx"> // default handling, the detail of which handlers are called is an internal
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventDispatcherh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventDispatcher.h (209810 => 209811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventDispatcher.h 2016-12-14 17:37:24 UTC (rev 209810)
+++ trunk/Source/WebCore/dom/EventDispatcher.h 2016-12-14 17:41:28 UTC (rev 209811)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> namespace EventDispatcher {
</span><span class="cx">
</span><del>-bool dispatchEvent(Node*, Event&);
</del><ins>+bool dispatchEvent(Node&, Event&);
</ins><span class="cx"> void dispatchScopedEvent(Node&, Event&);
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (209810 => 209811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2016-12-14 17:37:24 UTC (rev 209810)
+++ trunk/Source/WebCore/dom/Node.cpp 2016-12-14 17:41:28 UTC (rev 209811)
</span><span class="lines">@@ -2178,7 +2178,7 @@
</span><span class="cx"> if (is<TouchEvent>(event))
</span><span class="cx"> return dispatchTouchEvent(downcast<TouchEvent>(event));
</span><span class="cx"> #endif
</span><del>- return EventDispatcher::dispatchEvent(this, event);
</del><ins>+ return EventDispatcher::dispatchEvent(*this, event);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Node::dispatchSubtreeModifiedEvent()
</span><span class="lines">@@ -2209,7 +2209,7 @@
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS)
</span><span class="cx"> bool Node::dispatchTouchEvent(TouchEvent& event)
</span><span class="cx"> {
</span><del>- return EventDispatcher::dispatchEvent(this, event);
</del><ins>+ return EventDispatcher::dispatchEvent(*this, event);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -2216,7 +2216,7 @@
</span><span class="cx"> #if ENABLE(INDIE_UI)
</span><span class="cx"> bool Node::dispatchUIRequestEvent(UIRequestEvent& event)
</span><span class="cx"> {
</span><del>- EventDispatcher::dispatchEvent(this, event);
</del><ins>+ EventDispatcher::dispatchEvent(*this, event);
</ins><span class="cx"> return event.defaultHandled() || event.defaultPrevented();
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoredomScopedEventQueuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScopedEventQueue.cpp (209810 => 209811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScopedEventQueue.cpp 2016-12-14 17:37:24 UTC (rev 209810)
+++ trunk/Source/WebCore/dom/ScopedEventQueue.cpp 2016-12-14 17:41:28 UTC (rev 209811)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> ASSERT(event.target());
</span><span class="cx"> // Store the target in a local variable to avoid possibly dereferencing a nullified PassRefPtr after it's passed on.
</span><span class="cx"> Node* node = event.target()->toNode();
</span><del>- EventDispatcher::dispatchEvent(node, event);
</del><ins>+ EventDispatcher::dispatchEvent(*node, event);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScopedEventQueue::dispatchAllEvents()
</span></span></pre></div>
<a id="trunkSourceWebCoredomSimulatedClickcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/SimulatedClick.cpp (209810 => 209811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/SimulatedClick.cpp 2016-12-14 17:37:24 UTC (rev 209810)
+++ trunk/Source/WebCore/dom/SimulatedClick.cpp 2016-12-14 17:41:28 UTC (rev 209811)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> static void simulateMouseEvent(const AtomicString& eventType, Element& element, Event* underlyingEvent, SimulatedClickSource source)
</span><span class="cx"> {
</span><span class="cx"> auto event = SimulatedMouseEvent::create(eventType, element.document().defaultView(), underlyingEvent, element, source);
</span><del>- EventDispatcher::dispatchEvent(&element, event);
</del><ins>+ EventDispatcher::dispatchEvent(element, event);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void simulateClick(Element& element, Event* underlyingEvent, SimulatedClickMouseEventOptions mouseEventOptions, SimulatedClickVisualOptions visualOptions, SimulatedClickSource creationOptions)
</span></span></pre>
</div>
</div>
</body>
</html>