<!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>[165215] 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/165215">165215</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-06 14:13:05 -0800 (Thu, 06 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Do not compile fake mouse event handling when iOS Touch Events are enabled
https://bugs.webkit.org/show_bug.cgi?id=129725
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-03-06
Reviewed by Dan Bernstein.
Bug <rdar://problem/16218636>. The code is #ifdef'ed out to avoid setting up useless objects
and to avoid future mistake.
* page/EventHandler.cpp:
(WebCore::EventHandler::EventHandler):
(WebCore::EventHandler::~EventHandler):
(WebCore::EventHandler::clear):
(WebCore::EventHandler::handleMousePressEvent):
(WebCore::EventHandler::startAutoHideCursorTimer):
(WebCore::EventHandler::handleMouseMoveEvent):
(WebCore::EventHandler::dispatchFakeMouseMoveEventSoon):
(WebCore::EventHandler::dispatchFakeMouseMoveEventSoonInQuad):
* page/EventHandler.h:</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>
<li><a href="#trunkSourceWebCorepageEventHandlerh">trunk/Source/WebCore/page/EventHandler.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165214 => 165215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-06 21:59:14 UTC (rev 165214)
+++ trunk/Source/WebCore/ChangeLog 2014-03-06 22:13:05 UTC (rev 165215)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-03-06 Benjamin Poulain <bpoulain@apple.com>
+
+ [iOS] Do not compile fake mouse event handling when iOS Touch Events are enabled
+ https://bugs.webkit.org/show_bug.cgi?id=129725
+
+ Reviewed by Dan Bernstein.
+
+ Bug <rdar://problem/16218636>. The code is #ifdef'ed out to avoid setting up useless objects
+ and to avoid future mistake.
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::EventHandler):
+ (WebCore::EventHandler::~EventHandler):
+ (WebCore::EventHandler::clear):
+ (WebCore::EventHandler::handleMousePressEvent):
+ (WebCore::EventHandler::startAutoHideCursorTimer):
+ (WebCore::EventHandler::handleMouseMoveEvent):
+ (WebCore::EventHandler::dispatchFakeMouseMoveEventSoon):
+ (WebCore::EventHandler::dispatchFakeMouseMoveEventSoonInQuad):
+ * page/EventHandler.h:
+
</ins><span class="cx"> 2014-03-06 Pratik Solanki <psolanki@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. iOS build fix after r165199.
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (165214 => 165215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2014-03-06 21:59:14 UTC (rev 165214)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2014-03-06 22:13:05 UTC (rev 165215)
</span><span class="lines">@@ -144,12 +144,14 @@
</span><span class="cx">
</span><span class="cx"> using namespace SVGNames;
</span><span class="cx">
</span><ins>+#if !ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> // The amount of time to wait before sending a fake mouse event, triggered
</span><span class="cx"> // during a scroll. The short interval is used if the content responds to the mouse events
</span><span class="cx"> // in fakeMouseMoveDurationThreshold or less, otherwise the long interval is used.
</span><span class="cx"> const double fakeMouseMoveDurationThreshold = 0.01;
</span><span class="cx"> const double fakeMouseMoveShortInterval = 0.1;
</span><span class="cx"> const double fakeMouseMoveLongInterval = 0.25;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CURSOR_SUPPORT)
</span><span class="cx"> // The amount of time to wait for a cursor update on style and layout changes
</span><span class="lines">@@ -336,7 +338,9 @@
</span><span class="cx"> , m_autoscrollController(adoptPtr(new AutoscrollController))
</span><span class="cx"> , m_mouseDownMayStartAutoscroll(false)
</span><span class="cx"> , m_mouseDownWasInSubframe(false)
</span><ins>+#if !ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> , m_fakeMouseMoveEventTimer(this, &EventHandler::fakeMouseMoveEventTimerFired)
</span><ins>+#endif
</ins><span class="cx"> , m_svgPan(false)
</span><span class="cx"> , m_resizeLayer(0)
</span><span class="cx"> , m_eventHandlerWillResetCapturingMouseEventsElement(nullptr)
</span><span class="lines">@@ -379,7 +383,9 @@
</span><span class="cx">
</span><span class="cx"> EventHandler::~EventHandler()
</span><span class="cx"> {
</span><ins>+#if !ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> ASSERT(!m_fakeMouseMoveEventTimer.isActive());
</span><ins>+#endif
</ins><span class="cx"> #if ENABLE(CURSOR_VISIBILITY)
</span><span class="cx"> ASSERT(!m_autoHideCursorTimer.isActive());
</span><span class="cx"> #endif
</span><span class="lines">@@ -399,7 +405,9 @@
</span><span class="cx"> #if ENABLE(CURSOR_SUPPORT)
</span><span class="cx"> m_cursorUpdateTimer.stop();
</span><span class="cx"> #endif
</span><ins>+#if !ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> m_fakeMouseMoveEventTimer.stop();
</span><ins>+#endif
</ins><span class="cx"> #if ENABLE(CURSOR_VISIBILITY)
</span><span class="cx"> cancelAutoHideCursorTimer();
</span><span class="cx"> #endif
</span><span class="lines">@@ -680,7 +688,9 @@
</span><span class="cx"> dragState().source = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if !ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> cancelFakeMouseMoveEvent();
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> m_frame.document()->updateLayoutIgnorePendingStylesheets();
</span><span class="cx">
</span><span class="lines">@@ -1486,10 +1496,12 @@
</span><span class="cx">
</span><span class="cx"> m_autoHideCursorTimer.startOneShot(page->settings().timeWithoutMouseMovementBeforeHidingControls());
</span><span class="cx">
</span><ins>+#if !ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> // The fake mouse move event screws up the auto-hide feature (by resetting the auto-hide timer)
</span><span class="cx"> // so cancel any pending fake mouse moves.
</span><span class="cx"> if (m_fakeMouseMoveEventTimer.isActive())
</span><span class="cx"> m_fakeMouseMoveEventTimer.stop();
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventHandler::cancelAutoHideCursorTimer()
</span><span class="lines">@@ -1535,8 +1547,10 @@
</span><span class="cx">
</span><span class="cx"> // FIXME (bug 68185): this call should be made at another abstraction layer
</span><span class="cx"> m_frame.loader().resetMultipleFormSubmissionProtection();
</span><del>-
</del><ins>+
+#if !ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> cancelFakeMouseMoveEvent();
</span><ins>+#endif
</ins><span class="cx"> m_mousePressed = true;
</span><span class="cx"> m_capturesDragging = true;
</span><span class="cx"> setLastKnownMousePosition(mouseEvent);
</span><span class="lines">@@ -1767,7 +1781,9 @@
</span><span class="cx"> m_cursorUpdateTimer.stop();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if !ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> cancelFakeMouseMoveEvent();
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> if (m_svgPan) {
</span><span class="cx"> toSVGDocument(m_frame.document())->updatePan(m_frame.view()->windowToContents(m_lastKnownMousePosition));
</span><span class="lines">@@ -2748,6 +2764,7 @@
</span><span class="cx">
</span><span class="cx"> void EventHandler::dispatchFakeMouseMoveEventSoon()
</span><span class="cx"> {
</span><ins>+#if !ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> if (m_mousePressed)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2769,10 +2786,14 @@
</span><span class="cx"> if (!m_fakeMouseMoveEventTimer.isActive())
</span><span class="cx"> m_fakeMouseMoveEventTimer.startOneShot(fakeMouseMoveShortInterval);
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventHandler::dispatchFakeMouseMoveEventSoonInQuad(const FloatQuad& quad)
</span><span class="cx"> {
</span><ins>+#if ENABLE(IOS_TOUCH_EVENTS)
+ UNUSED_PARAM(quad);
+#else
</ins><span class="cx"> FrameView* view = m_frame.view();
</span><span class="cx"> if (!view)
</span><span class="cx"> return;
</span><span class="lines">@@ -2781,8 +2802,10 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> dispatchFakeMouseMoveEventSoon();
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> void EventHandler::cancelFakeMouseMoveEvent()
</span><span class="cx"> {
</span><span class="cx"> m_fakeMouseMoveEventTimer.stop();
</span><span class="lines">@@ -2811,6 +2834,7 @@
</span><span class="cx"> PlatformMouseEvent fakeMouseMoveEvent(m_lastKnownMousePosition, m_lastKnownMouseGlobalPosition, NoButton, PlatformEvent::MouseMoved, 0, shiftKey, ctrlKey, altKey, metaKey, currentTime());
</span><span class="cx"> mouseMoved(fakeMouseMoveEvent);
</span><span class="cx"> }
</span><ins>+#endif // !ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx">
</span><span class="cx"> void EventHandler::setResizingFrameSet(HTMLFrameSetElement* frameSet)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.h (165214 => 165215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.h 2014-03-06 21:59:14 UTC (rev 165214)
+++ trunk/Source/WebCore/page/EventHandler.h 2014-03-06 22:13:05 UTC (rev 165215)
</span><span class="lines">@@ -341,8 +341,10 @@
</span><span class="cx"> static bool isKeyboardOptionTab(KeyboardEvent*);
</span><span class="cx"> static bool eventInvertsTabsToLinksClientCallResult(KeyboardEvent*);
</span><span class="cx">
</span><ins>+#if !ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> void fakeMouseMoveEventTimerFired(Timer<EventHandler>&);
</span><span class="cx"> void cancelFakeMouseMoveEvent();
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> bool isInsideScrollbar(const IntPoint&) const;
</span><span class="cx">
</span><span class="lines">@@ -467,7 +469,9 @@
</span><span class="cx"> bool m_mouseDownMayStartAutoscroll;
</span><span class="cx"> bool m_mouseDownWasInSubframe;
</span><span class="cx">
</span><ins>+#if !ENABLE(IOS_TOUCH_EVENTS)
</ins><span class="cx"> Timer<EventHandler> m_fakeMouseMoveEventTimer;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> bool m_svgPan;
</span><span class="cx"> RefPtr<SVGElementInstance> m_instanceUnderMouse;
</span></span></pre>
</div>
</div>
</body>
</html>