<!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>[173025] 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/173025">173025</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-08-27 15:25:33 -0700 (Wed, 27 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Some EventHandler naming cleanup
https://bugs.webkit.org/show_bug.cgi?id=136303
Reviewed by Beth Dakin.
Rename "mev" variables to "mouseEvent".
No behavior change.
* page/EventHandler.cpp:
(WebCore::EventHandler::handleMousePressEvent):
(WebCore::EventHandler::handleMouseDoubleClickEvent):
(WebCore::EventHandler::handleMouseMoveEvent):
(WebCore::EventHandler::handleMouseReleaseEvent):
(WebCore::EventHandler::updateDragAndDrop):
(WebCore::EventHandler::prepareMouseEvent):
(WebCore::EventHandler::sendContextMenuEvent):
(WebCore::EventHandler::passMousePressEventToScrollbar):
(WebCore::EventHandler::dispatchSyntheticTouchEventIfEnabled):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173024 => 173025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-27 22:25:30 UTC (rev 173024)
+++ trunk/Source/WebCore/ChangeLog 2014-08-27 22:25:33 UTC (rev 173025)
</span><span class="lines">@@ -4,7 +4,29 @@
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=136303
</span><span class="cx">
</span><span class="cx"> Reviewed by Beth Dakin.
</span><ins>+
+ Rename "mev" variables to "mouseEvent".
+
+ No behavior change.
</ins><span class="cx">
</span><ins>+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::handleMousePressEvent):
+ (WebCore::EventHandler::handleMouseDoubleClickEvent):
+ (WebCore::EventHandler::handleMouseMoveEvent):
+ (WebCore::EventHandler::handleMouseReleaseEvent):
+ (WebCore::EventHandler::updateDragAndDrop):
+ (WebCore::EventHandler::prepareMouseEvent):
+ (WebCore::EventHandler::sendContextMenuEvent):
+ (WebCore::EventHandler::passMousePressEventToScrollbar):
+ (WebCore::EventHandler::dispatchSyntheticTouchEventIfEnabled):
+
+2014-08-27 Simon Fraser <simon.fraser@apple.com>
+
+ Some EventHandler naming cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=136303
+
+ Reviewed by Beth Dakin.
+
</ins><span class="cx"> Rename PlatformMouseEvent variables from "mouseEvent" to "platformMouseEvent"
</span><span class="cx"> so that a later patch can rename "mev" to "mouseEvent".
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (173024 => 173025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2014-08-27 22:25:30 UTC (rev 173024)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2014-08-27 22:25:33 UTC (rev 173025)
</span><span class="lines">@@ -1687,17 +1687,17 @@
</span><span class="cx"> // Save the document point we generate in case the window coordinate is invalidated by what happens
</span><span class="cx"> // when we dispatch the event.
</span><span class="cx"> LayoutPoint documentPoint = documentPointForWindowPoint(m_frame, plaformMouseEvent.position());
</span><del>- MouseEventWithHitTestResults mev = m_frame.document()->prepareMouseEvent(request, documentPoint, plaformMouseEvent);
</del><ins>+ MouseEventWithHitTestResults mouseEvent = m_frame.document()->prepareMouseEvent(request, documentPoint, plaformMouseEvent);
</ins><span class="cx">
</span><del>- if (!mev.targetNode()) {
</del><ins>+ if (!mouseEvent.targetNode()) {
</ins><span class="cx"> invalidateClick();
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_mousePressNode = mev.targetNode();
</del><ins>+ m_mousePressNode = mouseEvent.targetNode();
</ins><span class="cx">
</span><del>- RefPtr<Frame> subframe = subframeForHitTestResult(mev);
- if (subframe && passMousePressEventToSubframe(mev, subframe.get())) {
</del><ins>+ RefPtr<Frame> subframe = subframeForHitTestResult(mouseEvent);
+ if (subframe && passMousePressEventToSubframe(mouseEvent, subframe.get())) {
</ins><span class="cx"> // Start capturing future events for this frame. We only do this if we didn't clear
</span><span class="cx"> // the m_mousePressed flag, which may happen if an AppKit widget entered a modal event loop.
</span><span class="cx"> m_capturesDragging = subframe->eventHandler().capturesDragging();
</span><span class="lines">@@ -1723,7 +1723,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_clickCount = plaformMouseEvent.clickCount();
</span><del>- m_clickNode = mev.targetNode();
</del><ins>+ m_clickNode = mouseEvent.targetNode();
</ins><span class="cx">
</span><span class="cx"> if (!m_clickNode) {
</span><span class="cx"> invalidateClick();
</span><span class="lines">@@ -1744,48 +1744,48 @@
</span><span class="cx">
</span><span class="cx"> m_frame.selection().setCaretBlinkingSuspended(true);
</span><span class="cx">
</span><del>- bool swallowEvent = !dispatchMouseEvent(eventNames().mousedownEvent, mev.targetNode(), true, m_clickCount, plaformMouseEvent, true);
- m_capturesDragging = !swallowEvent || mev.scrollbar();
</del><ins>+ bool swallowEvent = !dispatchMouseEvent(eventNames().mousedownEvent, mouseEvent.targetNode(), true, m_clickCount, plaformMouseEvent, true);
+ m_capturesDragging = !swallowEvent || mouseEvent.scrollbar();
</ins><span class="cx">
</span><span class="cx"> // If the hit testing originally determined the event was in a scrollbar, refetch the MouseEventWithHitTestResults
</span><span class="cx"> // in case the scrollbar widget was destroyed when the mouse event was handled.
</span><del>- if (mev.scrollbar()) {
- const bool wasLastScrollBar = mev.scrollbar() == m_lastScrollbarUnderMouse.get();
</del><ins>+ if (mouseEvent.scrollbar()) {
+ const bool wasLastScrollBar = mouseEvent.scrollbar() == m_lastScrollbarUnderMouse.get();
</ins><span class="cx"> HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
</span><del>- mev = m_frame.document()->prepareMouseEvent(request, documentPoint, plaformMouseEvent);
- if (wasLastScrollBar && mev.scrollbar() != m_lastScrollbarUnderMouse.get())
</del><ins>+ mouseEvent = m_frame.document()->prepareMouseEvent(request, documentPoint, plaformMouseEvent);
+ if (wasLastScrollBar && mouseEvent.scrollbar() != m_lastScrollbarUnderMouse.get())
</ins><span class="cx"> m_lastScrollbarUnderMouse = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (swallowEvent) {
</span><span class="cx"> // scrollbars should get events anyway, even disabled controls might be scrollable
</span><del>- Scrollbar* scrollbar = mev.scrollbar();
</del><ins>+ Scrollbar* scrollbar = mouseEvent.scrollbar();
</ins><span class="cx">
</span><span class="cx"> updateLastScrollbarUnderMouse(scrollbar, true);
</span><span class="cx">
</span><span class="cx"> if (scrollbar)
</span><del>- passMousePressEventToScrollbar(mev, scrollbar);
</del><ins>+ passMousePressEventToScrollbar(mouseEvent, scrollbar);
</ins><span class="cx"> } else {
</span><span class="cx"> // Refetch the event target node if it currently is the shadow node inside an <input> element.
</span><span class="cx"> // If a mouse event handler changes the input element type to one that has a widget associated,
</span><span class="cx"> // we'd like to EventHandler::handleMousePressEvent to pass the event to the widget and thus the
</span><span class="cx"> // event target node can't still be the shadow node.
</span><del>- if (mev.targetNode()->isShadowRoot() && isHTMLInputElement(toShadowRoot(mev.targetNode())->hostElement())) {
</del><ins>+ if (mouseEvent.targetNode()->isShadowRoot() && isHTMLInputElement(toShadowRoot(mouseEvent.targetNode())->hostElement())) {
</ins><span class="cx"> HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
</span><del>- mev = m_frame.document()->prepareMouseEvent(request, documentPoint, plaformMouseEvent);
</del><ins>+ mouseEvent = m_frame.document()->prepareMouseEvent(request, documentPoint, plaformMouseEvent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FrameView* view = m_frame.view();
</span><span class="cx"> Scrollbar* scrollbar = view ? view->scrollbarAtPoint(plaformMouseEvent.position()) : 0;
</span><span class="cx"> if (!scrollbar)
</span><del>- scrollbar = mev.scrollbar();
</del><ins>+ scrollbar = mouseEvent.scrollbar();
</ins><span class="cx">
</span><span class="cx"> updateLastScrollbarUnderMouse(scrollbar, true);
</span><span class="cx">
</span><del>- if (scrollbar && passMousePressEventToScrollbar(mev, scrollbar))
</del><ins>+ if (scrollbar && passMousePressEventToScrollbar(mouseEvent, scrollbar))
</ins><span class="cx"> swallowEvent = true;
</span><span class="cx"> else
</span><del>- swallowEvent = handleMousePressEvent(mev);
</del><ins>+ swallowEvent = handleMousePressEvent(mouseEvent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return swallowEvent;
</span><span class="lines">@@ -1805,22 +1805,22 @@
</span><span class="cx"> setLastKnownMousePosition(plaformMouseEvent);
</span><span class="cx">
</span><span class="cx"> HitTestRequest request(HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
</span><del>- MouseEventWithHitTestResults mev = prepareMouseEvent(request, plaformMouseEvent);
- Frame* subframe = subframeForHitTestResult(mev);
</del><ins>+ MouseEventWithHitTestResults mouseEvent = prepareMouseEvent(request, plaformMouseEvent);
+ Frame* subframe = subframeForHitTestResult(mouseEvent);
</ins><span class="cx"> if (m_eventHandlerWillResetCapturingMouseEventsElement)
</span><span class="cx"> m_capturingMouseEventsElement = nullptr;
</span><del>- if (subframe && passMousePressEventToSubframe(mev, subframe))
</del><ins>+ if (subframe && passMousePressEventToSubframe(mouseEvent, subframe))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> m_clickCount = plaformMouseEvent.clickCount();
</span><del>- bool swallowMouseUpEvent = !dispatchMouseEvent(eventNames().mouseupEvent, mev.targetNode(), true, m_clickCount, plaformMouseEvent, false);
</del><ins>+ bool swallowMouseUpEvent = !dispatchMouseEvent(eventNames().mouseupEvent, mouseEvent.targetNode(), true, m_clickCount, plaformMouseEvent, false);
</ins><span class="cx">
</span><del>- bool swallowClickEvent = plaformMouseEvent.button() != RightButton && mev.targetNode() == m_clickNode && !dispatchMouseEvent(eventNames().clickEvent, mev.targetNode(), true, m_clickCount, plaformMouseEvent, true);
</del><ins>+ bool swallowClickEvent = plaformMouseEvent.button() != RightButton && mouseEvent.targetNode() == m_clickNode && !dispatchMouseEvent(eventNames().clickEvent, mouseEvent.targetNode(), true, m_clickCount, plaformMouseEvent, true);
</ins><span class="cx">
</span><span class="cx"> if (m_lastScrollbarUnderMouse)
</span><span class="cx"> swallowMouseUpEvent = m_lastScrollbarUnderMouse->mouseUp(plaformMouseEvent);
</span><span class="cx">
</span><del>- bool swallowMouseReleaseEvent = !swallowMouseUpEvent && handleMouseReleaseEvent(mev);
</del><ins>+ bool swallowMouseReleaseEvent = !swallowMouseUpEvent && handleMouseReleaseEvent(mouseEvent);
</ins><span class="cx">
</span><span class="cx"> invalidateClick();
</span><span class="cx">
</span><span class="lines">@@ -1935,14 +1935,14 @@
</span><span class="cx"> hitType |= HitTestRequest::Active | HitTestRequest::ReadOnly;
</span><span class="cx"> #endif
</span><span class="cx"> HitTestRequest request(hitType);
</span><del>- MouseEventWithHitTestResults mev = prepareMouseEvent(request, plaformMouseEvent);
</del><ins>+ MouseEventWithHitTestResults mouseEvent = prepareMouseEvent(request, plaformMouseEvent);
</ins><span class="cx"> if (hoveredNode)
</span><del>- *hoveredNode = mev.hitTestResult();
</del><ins>+ *hoveredNode = mouseEvent.hitTestResult();
</ins><span class="cx">
</span><span class="cx"> if (m_resizeLayer && m_resizeLayer->inResizeMode())
</span><span class="cx"> m_resizeLayer->resize(plaformMouseEvent, m_offsetFromResizeCorner);
</span><span class="cx"> else {
</span><del>- Scrollbar* scrollbar = mev.scrollbar();
</del><ins>+ Scrollbar* scrollbar = mouseEvent.scrollbar();
</ins><span class="cx"> updateLastScrollbarUnderMouse(scrollbar, !m_mousePressed);
</span><span class="cx">
</span><span class="cx"> // On iOS, our scrollbars are managed by UIKit.
</span><span class="lines">@@ -1955,24 +1955,24 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool swallowEvent = false;
</span><del>- RefPtr<Frame> newSubframe = m_capturingMouseEventsElement.get() ? subframeForTargetNode(m_capturingMouseEventsElement.get()) : subframeForHitTestResult(mev);
</del><ins>+ RefPtr<Frame> newSubframe = m_capturingMouseEventsElement.get() ? subframeForTargetNode(m_capturingMouseEventsElement.get()) : subframeForHitTestResult(mouseEvent);
</ins><span class="cx">
</span><span class="cx"> // We want mouseouts to happen first, from the inside out. First send a move event to the last subframe so that it will fire mouseouts.
</span><span class="cx"> if (m_lastMouseMoveEventSubframe && m_lastMouseMoveEventSubframe->tree().isDescendantOf(&m_frame) && m_lastMouseMoveEventSubframe != newSubframe)
</span><del>- passMouseMoveEventToSubframe(mev, m_lastMouseMoveEventSubframe.get());
</del><ins>+ passMouseMoveEventToSubframe(mouseEvent, m_lastMouseMoveEventSubframe.get());
</ins><span class="cx">
</span><span class="cx"> if (newSubframe) {
</span><span class="cx"> // Update over/out state before passing the event to the subframe.
</span><del>- updateMouseEventTargetNode(mev.targetNode(), plaformMouseEvent, true);
</del><ins>+ updateMouseEventTargetNode(mouseEvent.targetNode(), plaformMouseEvent, true);
</ins><span class="cx">
</span><span class="cx"> // Event dispatch in updateMouseEventTargetNode may have caused the subframe of the target
</span><span class="cx"> // node to be detached from its FrameView, in which case the event should not be passed.
</span><span class="cx"> if (newSubframe->view())
</span><del>- swallowEvent |= passMouseMoveEventToSubframe(mev, newSubframe.get(), hoveredNode);
</del><ins>+ swallowEvent |= passMouseMoveEventToSubframe(mouseEvent, newSubframe.get(), hoveredNode);
</ins><span class="cx"> #if ENABLE(CURSOR_SUPPORT)
</span><span class="cx"> } else {
</span><span class="cx"> if (FrameView* view = m_frame.view()) {
</span><del>- OptionalCursor optionalCursor = selectCursor(mev.hitTestResult(), plaformMouseEvent.shiftKey());
</del><ins>+ OptionalCursor optionalCursor = selectCursor(mouseEvent.hitTestResult(), plaformMouseEvent.shiftKey());
</ins><span class="cx"> if (optionalCursor.isCursorChange()) {
</span><span class="cx"> m_currentMouseCursor = optionalCursor.cursor();
</span><span class="cx"> view->setCursor(m_currentMouseCursor);
</span><span class="lines">@@ -1986,10 +1986,10 @@
</span><span class="cx"> if (swallowEvent)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- swallowEvent = !dispatchMouseEvent(eventNames().mousemoveEvent, mev.targetNode(), false, 0, plaformMouseEvent, true);
</del><ins>+ swallowEvent = !dispatchMouseEvent(eventNames().mousemoveEvent, mouseEvent.targetNode(), false, 0, plaformMouseEvent, true);
</ins><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> if (!swallowEvent)
</span><del>- swallowEvent = handleMouseDraggedEvent(mev);
</del><ins>+ swallowEvent = handleMouseDraggedEvent(mouseEvent);
</ins><span class="cx"> #endif // ENABLE(DRAG_SUPPORT)
</span><span class="cx">
</span><span class="cx"> return swallowEvent;
</span><span class="lines">@@ -2064,18 +2064,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HitTestRequest request(HitTestRequest::Release | HitTestRequest::DisallowShadowContent);
</span><del>- MouseEventWithHitTestResults mev = prepareMouseEvent(request, plaformMouseEvent);
- Frame* subframe = m_capturingMouseEventsElement.get() ? subframeForTargetNode(m_capturingMouseEventsElement.get()) : subframeForHitTestResult(mev);
</del><ins>+ MouseEventWithHitTestResults mouseEvent = prepareMouseEvent(request, plaformMouseEvent);
+ Frame* subframe = m_capturingMouseEventsElement.get() ? subframeForTargetNode(m_capturingMouseEventsElement.get()) : subframeForHitTestResult(mouseEvent);
</ins><span class="cx"> if (m_eventHandlerWillResetCapturingMouseEventsElement)
</span><span class="cx"> m_capturingMouseEventsElement = nullptr;
</span><del>- if (subframe && passMouseReleaseEventToSubframe(mev, subframe))
</del><ins>+ if (subframe && passMouseReleaseEventToSubframe(mouseEvent, subframe))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- bool swallowMouseUpEvent = !dispatchMouseEvent(eventNames().mouseupEvent, mev.targetNode(), true, m_clickCount, plaformMouseEvent, false);
</del><ins>+ bool swallowMouseUpEvent = !dispatchMouseEvent(eventNames().mouseupEvent, mouseEvent.targetNode(), true, m_clickCount, plaformMouseEvent, false);
</ins><span class="cx">
</span><span class="cx"> bool contextMenuEvent = plaformMouseEvent.button() == RightButton;
</span><span class="cx">
</span><del>- bool swallowClickEvent = m_clickCount > 0 && !contextMenuEvent && mouseIsReleasedOnPressedElement(mev.targetNode(), m_clickNode.get()) && !dispatchMouseEvent(eventNames().clickEvent, mev.targetNode(), true, m_clickCount, plaformMouseEvent, true);
</del><ins>+ bool swallowClickEvent = m_clickCount > 0 && !contextMenuEvent && mouseIsReleasedOnPressedElement(mouseEvent.targetNode(), m_clickNode.get()) && !dispatchMouseEvent(eventNames().clickEvent, mouseEvent.targetNode(), true, m_clickCount, plaformMouseEvent, true);
</ins><span class="cx">
</span><span class="cx"> if (m_resizeLayer) {
</span><span class="cx"> m_resizeLayer->setInResizeMode(false);
</span><span class="lines">@@ -2084,7 +2084,7 @@
</span><span class="cx">
</span><span class="cx"> bool swallowMouseReleaseEvent = false;
</span><span class="cx"> if (!swallowMouseUpEvent)
</span><del>- swallowMouseReleaseEvent = handleMouseReleaseEvent(mev);
</del><ins>+ swallowMouseReleaseEvent = handleMouseReleaseEvent(mouseEvent);
</ins><span class="cx">
</span><span class="cx"> invalidateClick();
</span><span class="cx">
</span><span class="lines">@@ -2244,10 +2244,10 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::DisallowShadowContent);
</span><del>- MouseEventWithHitTestResults mev = prepareMouseEvent(request, event);
</del><ins>+ MouseEventWithHitTestResults mouseEvent = prepareMouseEvent(request, event);
</ins><span class="cx">
</span><span class="cx"> RefPtr<Element> newTarget;
</span><del>- if (Node* targetNode = mev.targetNode()) {
</del><ins>+ if (Node* targetNode = mouseEvent.targetNode()) {
</ins><span class="cx"> // Drag events should never go to non-element nodes (following IE, and proper mouseover/out dispatch)
</span><span class="cx"> if (!targetNode->isElementNode())
</span><span class="cx"> newTarget = targetNode->parentOrShadowHostElement();
</span><span class="lines">@@ -2355,10 +2355,10 @@
</span><span class="cx"> m_eventHandlerWillResetCapturingMouseEventsElement = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MouseEventWithHitTestResults EventHandler::prepareMouseEvent(const HitTestRequest& request, const PlatformMouseEvent& mev)
</del><ins>+MouseEventWithHitTestResults EventHandler::prepareMouseEvent(const HitTestRequest& request, const PlatformMouseEvent& mouseEvent)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_frame.document());
</span><del>- return m_frame.document()->prepareMouseEvent(request, documentPointForWindowPoint(m_frame, mev.position()), mev);
</del><ins>+ return m_frame.document()->prepareMouseEvent(request, documentPointForWindowPoint(m_frame, mouseEvent.position()), mouseEvent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline SVGElementInstance* instanceAssociatedWithShadowTreeElement(Node* referenceNode)
</span><span class="lines">@@ -2791,20 +2791,20 @@
</span><span class="cx"> bool swallowEvent;
</span><span class="cx"> LayoutPoint viewportPos = v->windowToContents(event.position());
</span><span class="cx"> HitTestRequest request(HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
</span><del>- MouseEventWithHitTestResults mev = doc->prepareMouseEvent(request, viewportPos, event);
</del><ins>+ MouseEventWithHitTestResults mouseEvent = doc->prepareMouseEvent(request, viewportPos, event);
</ins><span class="cx">
</span><span class="cx"> if (m_frame.editor().behavior().shouldSelectOnContextualMenuClick()
</span><span class="cx"> && !m_frame.selection().contains(viewportPos)
</span><del>- && !mev.scrollbar()
</del><ins>+ && !mouseEvent.scrollbar()
</ins><span class="cx"> // FIXME: In the editable case, word selection sometimes selects content that isn't underneath the mouse.
</span><span class="cx"> // If the selection is non-editable, we do word selection to make it easier to use the contextual menu items
</span><span class="cx"> // available for text selections. But only if we're above text.
</span><del>- && (m_frame.selection().selection().isContentEditable() || (mev.targetNode() && mev.targetNode()->isTextNode()))) {
</del><ins>+ && (m_frame.selection().selection().isContentEditable() || (mouseEvent.targetNode() && mouseEvent.targetNode()->isTextNode()))) {
</ins><span class="cx"> m_mouseDownMayStartSelect = true; // context menu events are always allowed to perform a selection
</span><del>- selectClosestWordOrLinkFromMouseEvent(mev);
</del><ins>+ selectClosestWordOrLinkFromMouseEvent(mouseEvent);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- swallowEvent = !dispatchMouseEvent(eventNames().contextmenuEvent, mev.targetNode(), true, 0, event, false);
</del><ins>+ swallowEvent = !dispatchMouseEvent(eventNames().contextmenuEvent, mouseEvent.targetNode(), true, 0, event, false);
</ins><span class="cx">
</span><span class="cx"> return swallowEvent;
</span><span class="cx"> }
</span><span class="lines">@@ -3716,12 +3716,12 @@
</span><span class="cx"> v->setWasScrolledByUser(true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool EventHandler::passMousePressEventToScrollbar(MouseEventWithHitTestResults& mev, Scrollbar* scrollbar)
</del><ins>+bool EventHandler::passMousePressEventToScrollbar(MouseEventWithHitTestResults& mouseEvent, Scrollbar* scrollbar)
</ins><span class="cx"> {
</span><span class="cx"> if (!scrollbar || !scrollbar->enabled())
</span><span class="cx"> return false;
</span><span class="cx"> setFrameWasScrolledByUser();
</span><del>- return scrollbar->mouseDown(mev.event());
</del><ins>+ return scrollbar->mouseDown(mouseEvent.event());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If scrollbar (under mouse) is different from last, send a mouse exited. Set
</span><span class="lines">@@ -3994,8 +3994,8 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> HitTestRequest request(HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
</span><del>- MouseEventWithHitTestResults mev = prepareMouseEvent(request, plaformMouseEvent);
- if (mev.scrollbar() || subframeForHitTestResult(mev))
</del><ins>+ MouseEventWithHitTestResults mouseEvent = prepareMouseEvent(request, plaformMouseEvent);
+ if (mouseEvent.scrollbar() || subframeForHitTestResult(mouseEvent))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // The order is important. This check should follow the subframe test: http://webkit.org/b/111292.
</span></span></pre>
</div>
</div>
</body>
</html>