<!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>[163593] tags/Safari-538.16.2/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/163593">163593</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-02-06 18:01:02 -0800 (Thu, 06 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rollout <a href="http://trac.webkit.org/projects/webkit/changeset/163558">r163558</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari538162SourceWebCoreChangeLog">tags/Safari-538.16.2/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari538162SourceWebCorepageEventHandlercpp">tags/Safari-538.16.2/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#tagsSafari538162SourceWebCorepageWheelEventDeltaTrackerh">tags/Safari-538.16.2/Source/WebCore/page/WheelEventDeltaTracker.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari538162SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.16.2/Source/WebCore/ChangeLog (163592 => 163593)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.2/Source/WebCore/ChangeLog 2014-02-07 01:58:40 UTC (rev 163592)
+++ tags/Safari-538.16.2/Source/WebCore/ChangeLog 2014-02-07 02:01:02 UTC (rev 163593)
</span><span class="lines">@@ -1,5 +1,9 @@
</span><span class="cx"> 2014-02-06 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Rollout r163558
+
+2014-02-06 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r163558
</span><span class="cx">
</span><span class="cx"> 2014-02-05 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="tagsSafari538162SourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.16.2/Source/WebCore/page/EventHandler.cpp (163592 => 163593)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.2/Source/WebCore/page/EventHandler.cpp 2014-02-07 01:58:40 UTC (rev 163592)
+++ tags/Safari-538.16.2/Source/WebCore/page/EventHandler.cpp 2014-02-07 02:01:02 UTC (rev 163593)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2013 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
</span><span class="cx"> * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
</span><span class="cx"> *
</span><span class="lines">@@ -2553,35 +2553,6 @@
</span><span class="cx">
</span><span class="cx"> // We do another check on the frame view because the event handler can run JS which results in the frame getting destroyed.
</span><span class="cx"> view = m_frame.view();
</span><del>-
-#if PLATFORM(MAC)
- if (useLatchedWheelEventElement && m_latchedWheelEventElement == element) {
- bool enclosingFrameIsMainFrame = view ? view->frame().isMainFrame() : false;
-
- // If we are latched, and have nowhere to scroll, treat the scroll event as ended so that we don't
- // cause the scroll to break free of the current scrolling widget.
- if (!enclosingFrameIsMainFrame) {
- bool didHandleWheelEvent = view ? view->wheelEvent(event) : false;
- if (!didHandleWheelEvent) {
- // If we are just starting a scroll event, and have nowhere left to scroll, allow
- // the enclosing frame to handle the scroll.
- didHandleWheelEvent = !m_recentWheelEventDeltaTracker->isFirstWheelEvent();
- }
-
- m_isHandlingWheelEvent = false;
- return didHandleWheelEvent;
- }
-
- if (!m_recentWheelEventDeltaTracker->isFirstWheelEvent()) {
- // When the main frame is our parent, and we have been scrolling within this region, we do not
- // want to have the main frame consume any remaining scroll events. Keep them latched to this
- // element.
- m_isHandlingWheelEvent = false;
- return true;
- }
- }
-#endif
-
</del><span class="cx"> bool didHandleEvent = view ? view->wheelEvent(event) : false;
</span><span class="cx"> m_isHandlingWheelEvent = false;
</span><span class="cx"> return didHandleEvent;
</span></span></pre></div>
<a id="tagsSafari538162SourceWebCorepageWheelEventDeltaTrackerh"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.16.2/Source/WebCore/page/WheelEventDeltaTracker.h (163592 => 163593)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.2/Source/WebCore/page/WheelEventDeltaTracker.h 2014-02-07 01:58:40 UTC (rev 163592)
+++ tags/Safari-538.16.2/Source/WebCore/page/WheelEventDeltaTracker.h 2014-02-07 02:01:02 UTC (rev 163593)
</span><span class="lines">@@ -51,7 +51,6 @@
</span><span class="cx"> void endTrackingDeltas();
</span><span class="cx">
</span><span class="cx"> bool isTrackingDeltas() const { return m_isTrackingDeltas; }
</span><del>- bool isFirstWheelEvent() const { return m_recentWheelEventDeltas.size() <= 1; }
</del><span class="cx">
</span><span class="cx"> void recordWheelEventDelta(const PlatformWheelEvent&);
</span><span class="cx"> DominantScrollGestureDirection dominantScrollGestureDirection() const;
</span></span></pre>
</div>
</div>
</body>
</html>