<!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>[173033] 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/173033">173033</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-08-27 16:24:19 -0700 (Wed, 27 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Speling is hard.
Reviewed by Tim Horton.
* page/EventHandler.cpp:
(WebCore::EventHandler::handleMousePressEvent):
(WebCore::EventHandler::handleMouseDoubleClickEvent):
(WebCore::EventHandler::handleMouseMoveEvent):
(WebCore::EventHandler::handleMouseReleaseEvent):
(WebCore::EventHandler::handlePasteGlobalSelection):
(WebCore::EventHandler::updateMouseEventTargetNode):
(WebCore::EventHandler::dispatchMouseEvent):
(WebCore::EventHandler::sendContextMenuEventForKey):
(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 (173032 => 173033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-27 23:20:32 UTC (rev 173032)
+++ trunk/Source/WebCore/ChangeLog 2014-08-27 23:24:19 UTC (rev 173033)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-08-27 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Speling is hard.
+
+ Reviewed by Tim Horton.
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::handleMousePressEvent):
+ (WebCore::EventHandler::handleMouseDoubleClickEvent):
+ (WebCore::EventHandler::handleMouseMoveEvent):
+ (WebCore::EventHandler::handleMouseReleaseEvent):
+ (WebCore::EventHandler::handlePasteGlobalSelection):
+ (WebCore::EventHandler::updateMouseEventTargetNode):
+ (WebCore::EventHandler::dispatchMouseEvent):
+ (WebCore::EventHandler::sendContextMenuEventForKey):
+ (WebCore::EventHandler::dispatchSyntheticTouchEventIfEnabled):
+
+2014-08-27 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Fix the iOS build.
</span><span class="cx">
</span><span class="cx"> * page/EventHandler.cpp:
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (173032 => 173033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2014-08-27 23:20:32 UTC (rev 173032)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2014-08-27 23:24:19 UTC (rev 173033)
</span><span class="lines">@@ -1643,7 +1643,7 @@
</span><span class="cx"> return view ? view->windowToContents(windowPoint) : windowPoint;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool EventHandler::handleMousePressEvent(const PlatformMouseEvent& plaformMouseEvent)
</del><ins>+bool EventHandler::handleMousePressEvent(const PlatformMouseEvent& platformMouseEvent)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<FrameView> protector(m_frame.view());
</span><span class="cx">
</span><span class="lines">@@ -1653,7 +1653,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><del>- bool defaultPrevented = dispatchSyntheticTouchEventIfEnabled(plaformMouseEvent);
</del><ins>+ bool defaultPrevented = dispatchSyntheticTouchEventIfEnabled(platformMouseEvent);
</ins><span class="cx"> if (defaultPrevented)
</span><span class="cx"> return true;
</span><span class="cx"> #endif
</span><span class="lines">@@ -1668,15 +1668,15 @@
</span><span class="cx"> #endif
</span><span class="cx"> m_mousePressed = true;
</span><span class="cx"> m_capturesDragging = true;
</span><del>- setLastKnownMousePosition(plaformMouseEvent);
- m_mouseDownTimestamp = plaformMouseEvent.timestamp();
</del><ins>+ setLastKnownMousePosition(platformMouseEvent);
+ m_mouseDownTimestamp = platformMouseEvent.timestamp();
</ins><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> m_mouseDownMayStartDrag = false;
</span><span class="cx"> #endif
</span><span class="cx"> m_mouseDownMayStartSelect = false;
</span><span class="cx"> m_mouseDownMayStartAutoscroll = false;
</span><span class="cx"> if (FrameView* view = m_frame.view())
</span><del>- m_mouseDownPos = view->windowToContents(plaformMouseEvent.position());
</del><ins>+ m_mouseDownPos = view->windowToContents(platformMouseEvent.position());
</ins><span class="cx"> else {
</span><span class="cx"> invalidateClick();
</span><span class="cx"> return false;
</span><span class="lines">@@ -1686,8 +1686,8 @@
</span><span class="cx"> HitTestRequest request(HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
</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><del>- LayoutPoint documentPoint = documentPointForWindowPoint(m_frame, plaformMouseEvent.position());
- MouseEventWithHitTestResults mouseEvent = m_frame.document()->prepareMouseEvent(request, documentPoint, plaformMouseEvent);
</del><ins>+ LayoutPoint documentPoint = documentPointForWindowPoint(m_frame, platformMouseEvent.position());
+ MouseEventWithHitTestResults mouseEvent = m_frame.document()->prepareMouseEvent(request, documentPoint, platformMouseEvent);
</ins><span class="cx">
</span><span class="cx"> if (!mouseEvent.targetNode()) {
</span><span class="cx"> invalidateClick();
</span><span class="lines">@@ -1722,7 +1722,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- m_clickCount = plaformMouseEvent.clickCount();
</del><ins>+ m_clickCount = platformMouseEvent.clickCount();
</ins><span class="cx"> m_clickNode = mouseEvent.targetNode();
</span><span class="cx">
</span><span class="cx"> if (!m_clickNode) {
</span><span class="lines">@@ -1732,7 +1732,7 @@
</span><span class="cx">
</span><span class="cx"> if (FrameView* view = m_frame.view()) {
</span><span class="cx"> RenderLayer* layer = m_clickNode->renderer() ? m_clickNode->renderer()->enclosingLayer() : 0;
</span><del>- IntPoint p = view->windowToContents(plaformMouseEvent.position());
</del><ins>+ IntPoint p = view->windowToContents(platformMouseEvent.position());
</ins><span class="cx"> if (layer && layer->isPointInResizeControl(p)) {
</span><span class="cx"> layer->setInResizeMode(true);
</span><span class="cx"> m_resizeLayer = layer;
</span><span class="lines">@@ -1744,7 +1744,7 @@
</span><span class="cx">
</span><span class="cx"> m_frame.selection().setCaretBlinkingSuspended(true);
</span><span class="cx">
</span><del>- bool swallowEvent = !dispatchMouseEvent(eventNames().mousedownEvent, mouseEvent.targetNode(), true, m_clickCount, plaformMouseEvent, true);
</del><ins>+ bool swallowEvent = !dispatchMouseEvent(eventNames().mousedownEvent, mouseEvent.targetNode(), true, m_clickCount, platformMouseEvent, true);
</ins><span class="cx"> m_capturesDragging = !swallowEvent || mouseEvent.scrollbar();
</span><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="lines">@@ -1752,7 +1752,7 @@
</span><span class="cx"> if (mouseEvent.scrollbar()) {
</span><span class="cx"> const bool wasLastScrollBar = mouseEvent.scrollbar() == m_lastScrollbarUnderMouse.get();
</span><span class="cx"> HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
</span><del>- mouseEvent = m_frame.document()->prepareMouseEvent(request, documentPoint, plaformMouseEvent);
</del><ins>+ mouseEvent = m_frame.document()->prepareMouseEvent(request, documentPoint, platformMouseEvent);
</ins><span class="cx"> if (wasLastScrollBar && mouseEvent.scrollbar() != m_lastScrollbarUnderMouse.get())
</span><span class="cx"> m_lastScrollbarUnderMouse = nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -1772,11 +1772,11 @@
</span><span class="cx"> // event target node can't still be the shadow node.
</span><span class="cx"> if (mouseEvent.targetNode()->isShadowRoot() && isHTMLInputElement(toShadowRoot(mouseEvent.targetNode())->hostElement())) {
</span><span class="cx"> HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
</span><del>- mouseEvent = m_frame.document()->prepareMouseEvent(request, documentPoint, plaformMouseEvent);
</del><ins>+ mouseEvent = m_frame.document()->prepareMouseEvent(request, documentPoint, platformMouseEvent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FrameView* view = m_frame.view();
</span><del>- Scrollbar* scrollbar = view ? view->scrollbarAtPoint(plaformMouseEvent.position()) : 0;
</del><ins>+ Scrollbar* scrollbar = view ? view->scrollbarAtPoint(platformMouseEvent.position()) : 0;
</ins><span class="cx"> if (!scrollbar)
</span><span class="cx"> scrollbar = mouseEvent.scrollbar();
</span><span class="cx">
</span><span class="lines">@@ -1792,7 +1792,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // This method only exists for platforms that don't know how to deliver
</span><del>-bool EventHandler::handleMouseDoubleClickEvent(const PlatformMouseEvent& plaformMouseEvent)
</del><ins>+bool EventHandler::handleMouseDoubleClickEvent(const PlatformMouseEvent& platformMouseEvent)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<FrameView> protector(m_frame.view());
</span><span class="cx">
</span><span class="lines">@@ -1802,23 +1802,23 @@
</span><span class="cx">
</span><span class="cx"> // We get this instead of a second mouse-up
</span><span class="cx"> m_mousePressed = false;
</span><del>- setLastKnownMousePosition(plaformMouseEvent);
</del><ins>+ setLastKnownMousePosition(platformMouseEvent);
</ins><span class="cx">
</span><span class="cx"> HitTestRequest request(HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
</span><del>- MouseEventWithHitTestResults mouseEvent = prepareMouseEvent(request, plaformMouseEvent);
</del><ins>+ MouseEventWithHitTestResults mouseEvent = prepareMouseEvent(request, platformMouseEvent);
</ins><span class="cx"> Frame* subframe = subframeForHitTestResult(mouseEvent);
</span><span class="cx"> if (m_eventHandlerWillResetCapturingMouseEventsElement)
</span><span class="cx"> m_capturingMouseEventsElement = nullptr;
</span><span class="cx"> if (subframe && passMousePressEventToSubframe(mouseEvent, subframe))
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- m_clickCount = plaformMouseEvent.clickCount();
- bool swallowMouseUpEvent = !dispatchMouseEvent(eventNames().mouseupEvent, mouseEvent.targetNode(), true, m_clickCount, plaformMouseEvent, false);
</del><ins>+ m_clickCount = platformMouseEvent.clickCount();
+ bool swallowMouseUpEvent = !dispatchMouseEvent(eventNames().mouseupEvent, mouseEvent.targetNode(), true, m_clickCount, platformMouseEvent, false);
</ins><span class="cx">
</span><del>- bool swallowClickEvent = plaformMouseEvent.button() != RightButton && mouseEvent.targetNode() == m_clickNode && !dispatchMouseEvent(eventNames().clickEvent, mouseEvent.targetNode(), true, m_clickCount, plaformMouseEvent, true);
</del><ins>+ bool swallowClickEvent = platformMouseEvent.button() != RightButton && mouseEvent.targetNode() == m_clickNode && !dispatchMouseEvent(eventNames().clickEvent, mouseEvent.targetNode(), true, m_clickCount, platformMouseEvent, true);
</ins><span class="cx">
</span><span class="cx"> if (m_lastScrollbarUnderMouse)
</span><del>- swallowMouseUpEvent = m_lastScrollbarUnderMouse->mouseUp(plaformMouseEvent);
</del><ins>+ swallowMouseUpEvent = m_lastScrollbarUnderMouse->mouseUp(platformMouseEvent);
</ins><span class="cx">
</span><span class="cx"> bool swallowMouseReleaseEvent = !swallowMouseUpEvent && handleMouseReleaseEvent(mouseEvent);
</span><span class="cx">
</span><span class="lines">@@ -1877,20 +1877,20 @@
</span><span class="cx"> return handleMouseMoveEvent(event, &hoveredNode, true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& plaformMouseEvent, HitTestResult* hoveredNode, bool onlyUpdateScrollbars)
</del><ins>+bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& platformMouseEvent, HitTestResult* hoveredNode, bool onlyUpdateScrollbars)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><del>- bool defaultPrevented = dispatchSyntheticTouchEventIfEnabled(plaformMouseEvent);
</del><ins>+ bool defaultPrevented = dispatchSyntheticTouchEventIfEnabled(platformMouseEvent);
</ins><span class="cx"> if (defaultPrevented)
</span><span class="cx"> return true;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (handleLongMousePressMouseMovedEvent(plaformMouseEvent))
</del><ins>+ if (handleLongMousePressMouseMovedEvent(platformMouseEvent))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> RefPtr<FrameView> protector(m_frame.view());
</span><span class="cx">
</span><del>- setLastKnownMousePosition(plaformMouseEvent);
</del><ins>+ setLastKnownMousePosition(platformMouseEvent);
</ins><span class="cx">
</span><span class="cx"> if (m_hoverTimer.isActive())
</span><span class="cx"> m_hoverTimer.stop();
</span><span class="lines">@@ -1909,13 +1909,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_frameSetBeingResized)
</span><del>- return !dispatchMouseEvent(eventNames().mousemoveEvent, m_frameSetBeingResized.get(), false, 0, plaformMouseEvent, false);
</del><ins>+ return !dispatchMouseEvent(eventNames().mousemoveEvent, m_frameSetBeingResized.get(), false, 0, platformMouseEvent, false);
</ins><span class="cx">
</span><span class="cx"> // On iOS, our scrollbars are managed by UIKit.
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> // Send events right to a scrollbar if the mouse is pressed.
</span><span class="cx"> if (m_lastScrollbarUnderMouse && m_mousePressed)
</span><del>- return m_lastScrollbarUnderMouse->mouseMoved(plaformMouseEvent);
</del><ins>+ return m_lastScrollbarUnderMouse->mouseMoved(platformMouseEvent);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> HitTestRequest::HitTestRequestType hitType = HitTestRequest::Move | HitTestRequest::DisallowShadowContent | HitTestRequest::AllowFrameScrollbars;
</span><span class="lines">@@ -1935,12 +1935,12 @@
</span><span class="cx"> hitType |= HitTestRequest::Active | HitTestRequest::ReadOnly;
</span><span class="cx"> #endif
</span><span class="cx"> HitTestRequest request(hitType);
</span><del>- MouseEventWithHitTestResults mouseEvent = prepareMouseEvent(request, plaformMouseEvent);
</del><ins>+ MouseEventWithHitTestResults mouseEvent = prepareMouseEvent(request, platformMouseEvent);
</ins><span class="cx"> if (hoveredNode)
</span><span class="cx"> *hoveredNode = mouseEvent.hitTestResult();
</span><span class="cx">
</span><span class="cx"> if (m_resizeLayer && m_resizeLayer->inResizeMode())
</span><del>- m_resizeLayer->resize(plaformMouseEvent, m_offsetFromResizeCorner);
</del><ins>+ m_resizeLayer->resize(platformMouseEvent, m_offsetFromResizeCorner);
</ins><span class="cx"> else {
</span><span class="cx"> Scrollbar* scrollbar = mouseEvent.scrollbar();
</span><span class="cx"> updateLastScrollbarUnderMouse(scrollbar, !m_mousePressed);
</span><span class="lines">@@ -1948,7 +1948,7 @@
</span><span class="cx"> // On iOS, our scrollbars are managed by UIKit.
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> if (!m_mousePressed && scrollbar)
</span><del>- scrollbar->mouseMoved(plaformMouseEvent); // Handle hover effects on platforms that support visual feedback on scrollbar hovering.
</del><ins>+ scrollbar->mouseMoved(platformMouseEvent); // Handle hover effects on platforms that support visual feedback on scrollbar hovering.
</ins><span class="cx"> #endif
</span><span class="cx"> if (onlyUpdateScrollbars)
</span><span class="cx"> return true;
</span><span class="lines">@@ -1963,7 +1963,7 @@
</span><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(mouseEvent.targetNode(), plaformMouseEvent, true);
</del><ins>+ updateMouseEventTargetNode(mouseEvent.targetNode(), platformMouseEvent, 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="lines">@@ -1972,7 +1972,7 @@
</span><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(mouseEvent.hitTestResult(), plaformMouseEvent.shiftKey());
</del><ins>+ OptionalCursor optionalCursor = selectCursor(mouseEvent.hitTestResult(), platformMouseEvent.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,7 +1986,7 @@
</span><span class="cx"> if (swallowEvent)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- swallowEvent = !dispatchMouseEvent(eventNames().mousemoveEvent, mouseEvent.targetNode(), false, 0, plaformMouseEvent, true);
</del><ins>+ swallowEvent = !dispatchMouseEvent(eventNames().mousemoveEvent, mouseEvent.targetNode(), false, 0, platformMouseEvent, true);
</ins><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> if (!swallowEvent)
</span><span class="cx"> swallowEvent = handleMouseDraggedEvent(mouseEvent);
</span><span class="lines">@@ -2025,14 +2025,14 @@
</span><span class="cx"> return adjustedTargetNode == adjustedClickNode;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool EventHandler::handleMouseReleaseEvent(const PlatformMouseEvent& plaformMouseEvent)
</del><ins>+bool EventHandler::handleMouseReleaseEvent(const PlatformMouseEvent& platformMouseEvent)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<FrameView> protector(m_frame.view());
</span><span class="cx">
</span><span class="cx"> m_frame.selection().setCaretBlinkingSuspended(false);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><del>- bool defaultPrevented = dispatchSyntheticTouchEventIfEnabled(plaformMouseEvent);
</del><ins>+ bool defaultPrevented = dispatchSyntheticTouchEventIfEnabled(platformMouseEvent);
</ins><span class="cx"> if (defaultPrevented)
</span><span class="cx"> return true;
</span><span class="cx"> #endif
</span><span class="lines">@@ -2040,11 +2040,11 @@
</span><span class="cx"> UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PAN_SCROLLING)
</span><del>- m_autoscrollController->handleMouseReleaseEvent(plaformMouseEvent);
</del><ins>+ m_autoscrollController->handleMouseReleaseEvent(platformMouseEvent);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_mousePressed = false;
</span><del>- setLastKnownMousePosition(plaformMouseEvent);
</del><ins>+ setLastKnownMousePosition(platformMouseEvent);
</ins><span class="cx">
</span><span class="cx"> if (m_svgPan) {
</span><span class="cx"> m_svgPan = false;
</span><span class="lines">@@ -2053,29 +2053,29 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_frameSetBeingResized)
</span><del>- return !dispatchMouseEvent(eventNames().mouseupEvent, m_frameSetBeingResized.get(), true, m_clickCount, plaformMouseEvent, false);
</del><ins>+ return !dispatchMouseEvent(eventNames().mouseupEvent, m_frameSetBeingResized.get(), true, m_clickCount, platformMouseEvent, false);
</ins><span class="cx">
</span><span class="cx"> if (m_lastScrollbarUnderMouse) {
</span><span class="cx"> invalidateClick();
</span><del>- m_lastScrollbarUnderMouse->mouseUp(plaformMouseEvent);
</del><ins>+ m_lastScrollbarUnderMouse->mouseUp(platformMouseEvent);
</ins><span class="cx"> bool cancelable = true;
</span><span class="cx"> bool setUnder = false;
</span><del>- return !dispatchMouseEvent(eventNames().mouseupEvent, m_lastElementUnderMouse.get(), cancelable, m_clickCount, plaformMouseEvent, setUnder);
</del><ins>+ return !dispatchMouseEvent(eventNames().mouseupEvent, m_lastElementUnderMouse.get(), cancelable, m_clickCount, platformMouseEvent, setUnder);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HitTestRequest request(HitTestRequest::Release | HitTestRequest::DisallowShadowContent);
</span><del>- MouseEventWithHitTestResults mouseEvent = prepareMouseEvent(request, plaformMouseEvent);
</del><ins>+ MouseEventWithHitTestResults mouseEvent = prepareMouseEvent(request, platformMouseEvent);
</ins><span class="cx"> Frame* subframe = m_capturingMouseEventsElement.get() ? subframeForTargetNode(m_capturingMouseEventsElement.get()) : subframeForHitTestResult(mouseEvent);
</span><span class="cx"> if (m_eventHandlerWillResetCapturingMouseEventsElement)
</span><span class="cx"> m_capturingMouseEventsElement = nullptr;
</span><span class="cx"> if (subframe && passMouseReleaseEventToSubframe(mouseEvent, subframe))
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- bool swallowMouseUpEvent = !dispatchMouseEvent(eventNames().mouseupEvent, mouseEvent.targetNode(), true, m_clickCount, plaformMouseEvent, false);
</del><ins>+ bool swallowMouseUpEvent = !dispatchMouseEvent(eventNames().mouseupEvent, mouseEvent.targetNode(), true, m_clickCount, platformMouseEvent, false);
</ins><span class="cx">
</span><del>- bool contextMenuEvent = plaformMouseEvent.button() == RightButton;
</del><ins>+ bool contextMenuEvent = platformMouseEvent.button() == RightButton;
</ins><span class="cx">
</span><del>- bool swallowClickEvent = m_clickCount > 0 && !contextMenuEvent && mouseIsReleasedOnPressedElement(mouseEvent.targetNode(), m_clickNode.get()) && !dispatchMouseEvent(eventNames().clickEvent, mouseEvent.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, platformMouseEvent, true);
</ins><span class="cx">
</span><span class="cx"> if (m_resizeLayer) {
</span><span class="cx"> m_resizeLayer->setInResizeMode(false);
</span><span class="lines">@@ -2091,7 +2091,7 @@
</span><span class="cx"> return swallowMouseUpEvent || swallowClickEvent || swallowMouseReleaseEvent;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool EventHandler::handlePasteGlobalSelection(const PlatformMouseEvent& plaformMouseEvent)
</del><ins>+bool EventHandler::handlePasteGlobalSelection(const PlatformMouseEvent& platformMouseEvent)
</ins><span class="cx"> {
</span><span class="cx"> // If the event was a middle click, attempt to copy global selection in after
</span><span class="cx"> // the newly set caret position.
</span><span class="lines">@@ -2110,10 +2110,10 @@
</span><span class="cx"> // clears the text box. So it's important this happens after the event
</span><span class="cx"> // handlers have been fired.
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>- if (plaformMouseEvent.type() != PlatformEvent::MousePressed)
</del><ins>+ if (platformMouseEvent.type() != PlatformEvent::MousePressed)
</ins><span class="cx"> return false;
</span><span class="cx"> #else
</span><del>- if (plaformMouseEvent.type() != PlatformEvent::MouseReleased)
</del><ins>+ if (platformMouseEvent.type() != PlatformEvent::MouseReleased)
</ins><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -2401,7 +2401,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EventHandler::updateMouseEventTargetNode(Node* targetNode, const PlatformMouseEvent& plaformMouseEvent, bool fireMouseOverOut)
</del><ins>+void EventHandler::updateMouseEventTargetNode(Node* targetNode, const PlatformMouseEvent& platformMouseEvent, bool fireMouseOverOut)
</ins><span class="cx"> {
</span><span class="cx"> Element* targetElement = nullptr;
</span><span class="cx">
</span><span class="lines">@@ -2530,22 +2530,22 @@
</span><span class="cx">
</span><span class="cx"> // Send mouseout event to the old node.
</span><span class="cx"> if (m_lastElementUnderMouse)
</span><del>- m_lastElementUnderMouse->dispatchMouseEvent(plaformMouseEvent, eventNames().mouseoutEvent, 0, m_elementUnderMouse.get());
</del><ins>+ m_lastElementUnderMouse->dispatchMouseEvent(platformMouseEvent, eventNames().mouseoutEvent, 0, m_elementUnderMouse.get());
</ins><span class="cx">
</span><span class="cx"> // Send mouseleave to the node hierarchy no longer under the mouse.
</span><span class="cx"> for (size_t i = 0; i < leftElementsChain.size(); ++i) {
</span><span class="cx"> if (hasCapturingMouseLeaveListener || leftElementsChain[i]->hasEventListeners(eventNames().mouseleaveEvent))
</span><del>- leftElementsChain[i]->dispatchMouseEvent(plaformMouseEvent, eventNames().mouseleaveEvent, 0, m_elementUnderMouse.get());
</del><ins>+ leftElementsChain[i]->dispatchMouseEvent(platformMouseEvent, eventNames().mouseleaveEvent, 0, m_elementUnderMouse.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Send mouseover event to the new node.
</span><span class="cx"> if (m_elementUnderMouse)
</span><del>- m_elementUnderMouse->dispatchMouseEvent(plaformMouseEvent, eventNames().mouseoverEvent, 0, m_lastElementUnderMouse.get());
</del><ins>+ m_elementUnderMouse->dispatchMouseEvent(platformMouseEvent, eventNames().mouseoverEvent, 0, m_lastElementUnderMouse.get());
</ins><span class="cx">
</span><span class="cx"> // Send mouseleave event to the nodes hierarchy under the mouse.
</span><span class="cx"> for (size_t i = 0, size = enteredElementsChain.size(); i < size; ++i) {
</span><span class="cx"> if (hasCapturingMouseEnterListener || enteredElementsChain[i]->hasEventListeners(eventNames().mouseenterEvent))
</span><del>- enteredElementsChain[i]->dispatchMouseEvent(plaformMouseEvent, eventNames().mouseenterEvent, 0, m_lastElementUnderMouse.get());
</del><ins>+ enteredElementsChain[i]->dispatchMouseEvent(platformMouseEvent, eventNames().mouseenterEvent, 0, m_lastElementUnderMouse.get());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> m_lastElementUnderMouse = m_elementUnderMouse;
</span><span class="lines">@@ -2553,23 +2553,23 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool EventHandler::dispatchMouseEvent(const AtomicString& eventType, Node* targetNode, bool /*cancelable*/, int clickCount, const PlatformMouseEvent& plaformMouseEvent, bool setUnder)
</del><ins>+bool EventHandler::dispatchMouseEvent(const AtomicString& eventType, Node* targetNode, bool /*cancelable*/, int clickCount, const PlatformMouseEvent& platformMouseEvent, bool setUnder)
</ins><span class="cx"> {
</span><span class="cx"> if (FrameView* view = m_frame.view())
</span><span class="cx"> view->disableLayerFlushThrottlingTemporarilyForInteraction();
</span><span class="cx">
</span><del>- updateMouseEventTargetNode(targetNode, plaformMouseEvent, setUnder);
</del><ins>+ updateMouseEventTargetNode(targetNode, platformMouseEvent, setUnder);
</ins><span class="cx">
</span><span class="cx"> bool swallowEvent = false;
</span><span class="cx">
</span><span class="cx"> if (m_elementUnderMouse)
</span><del>- swallowEvent = !(m_elementUnderMouse->dispatchMouseEvent(plaformMouseEvent, eventType, clickCount));
</del><ins>+ swallowEvent = !(m_elementUnderMouse->dispatchMouseEvent(platformMouseEvent, eventType, clickCount));
</ins><span class="cx">
</span><span class="cx"> if (!swallowEvent && eventType == eventNames().mousedownEvent) {
</span><span class="cx">
</span><span class="cx"> // If clicking on a frame scrollbar, do not mess up with content focus.
</span><span class="cx"> if (FrameView* view = m_frame.view()) {
</span><del>- if (view->scrollbarAtPoint(plaformMouseEvent.position()))
</del><ins>+ if (view->scrollbarAtPoint(platformMouseEvent.position()))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2600,7 +2600,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Only change the focus when clicking scrollbars if it can transfered to a mouse focusable node.
</span><del>- if ((!element || !element->isMouseFocusable()) && isInsideScrollbar(plaformMouseEvent.position()))
</del><ins>+ if ((!element || !element->isMouseFocusable()) && isInsideScrollbar(platformMouseEvent.position()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // If focus shift is blocked, we eat the event. Note we should never clear swallowEvent
</span><span class="lines">@@ -2878,9 +2878,9 @@
</span><span class="cx"> PlatformEvent::Type eventType = PlatformEvent::MousePressed;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- PlatformMouseEvent plaformMouseEvent(position, globalPosition, RightButton, eventType, 1, false, false, false, false, WTF::currentTime());
</del><ins>+ PlatformMouseEvent platformMouseEvent(position, globalPosition, RightButton, eventType, 1, false, false, false, false, WTF::currentTime());
</ins><span class="cx">
</span><del>- return !dispatchMouseEvent(eventNames().contextmenuEvent, targetNode, true, 0, plaformMouseEvent, false);
</del><ins>+ return !dispatchMouseEvent(eventNames().contextmenuEvent, targetNode, true, 0, platformMouseEvent, false);
</ins><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(CONTEXT_MENUS)
</span><span class="cx">
</span><span class="lines">@@ -3980,21 +3980,21 @@
</span><span class="cx"> #endif // ENABLE(TOUCH_EVENTS) && !ENABLE(IOS_TOUCH_EVENTS)
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><del>-bool EventHandler::dispatchSyntheticTouchEventIfEnabled(const PlatformMouseEvent& plaformMouseEvent)
</del><ins>+bool EventHandler::dispatchSyntheticTouchEventIfEnabled(const PlatformMouseEvent& platformMouseEvent)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS)
</span><del>- UNUSED_PARAM(plaformMouseEvent);
</del><ins>+ UNUSED_PARAM(platformMouseEvent);
</ins><span class="cx"> return false;
</span><span class="cx"> #else
</span><span class="cx"> if (!m_frame.settings().isTouchEventEmulationEnabled())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- PlatformEvent::Type eventType = plaformMouseEvent.type();
</del><ins>+ PlatformEvent::Type eventType = platformMouseEvent.type();
</ins><span class="cx"> if (eventType != PlatformEvent::MouseMoved && eventType != PlatformEvent::MousePressed && eventType != PlatformEvent::MouseReleased)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> HitTestRequest request(HitTestRequest::Active | HitTestRequest::DisallowShadowContent);
</span><del>- MouseEventWithHitTestResults mouseEvent = prepareMouseEvent(request, plaformMouseEvent);
</del><ins>+ MouseEventWithHitTestResults mouseEvent = prepareMouseEvent(request, platformMouseEvent);
</ins><span class="cx"> if (mouseEvent.scrollbar() || subframeForHitTestResult(mouseEvent))
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -4002,7 +4002,7 @@
</span><span class="cx"> if (eventType == PlatformEvent::MouseMoved && !m_touchPressed)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- SyntheticSingleTouchEvent touchEvent(plaformMouseEvent);
</del><ins>+ SyntheticSingleTouchEvent touchEvent(platformMouseEvent);
</ins><span class="cx"> return handleTouchEvent(touchEvent);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>