<!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>[167560] trunk</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/167560">167560</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-04-19 19:32:48 -0700 (Sat, 19 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Latched scrolling may interact badly with custom programmatic scrolling
https://bugs.webkit.org/show_bug.cgi?id=131869
<rdar://problem/16249557>
Reviewed by Darin Adler.
* dom/Element.cpp:
(WebCore::Element::setScrollLeft): Mark scrollable area as having
been scrolled programmatically.
(WebCore::Element::setScrollTop): Ditto.
* page/EventHandler.cpp:
(WebCore::EventHandler::handleWheelEvent): Check for programmatic scroll, and
clear latched state if the handler manually scrolled. Clear programmatic
scroll state at the end of event handling.
(WebCore::EventHandler::clearLatchedState): Refactored code.
* page/EventHandler.h:
* page/mac/EventHandlerMac.mm:
(WebCore::EventHandler::platformPrepareForWheelEvents): Check
if scrollable area was scrolled programmatically. If it was, do
not honor latching behavior.
* platform/ScrollableArea.cpp:
(WebCore::ScrollableArea::ScrollableArea): Initialize new member.
* platform/ScrollableArea.h:
(WebCore::ScrollableArea::isScrolledProgrammatically): Added.
(WebCore::ScrollableArea::setScrolledProgrammatically): Added.</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="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlerh">trunk/Source/WebCore/page/EventHandler.h</a></li>
<li><a href="#trunkSourceWebCorepagemacEventHandlerMacmm">trunk/Source/WebCore/page/mac/EventHandlerMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollableAreacpp">trunk/Source/WebCore/platform/ScrollableArea.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollableAreah">trunk/Source/WebCore/platform/ScrollableArea.h</a></li>
<li><a href="#trunkWebKitxcworkspacexcshareddataxcschemesAllSourcetargetWebProcessxcscheme">trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167559 => 167560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-20 01:38:48 UTC (rev 167559)
+++ trunk/Source/WebCore/ChangeLog 2014-04-20 02:32:48 UTC (rev 167560)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-04-19 Brent Fulgham <bfulgham@apple.com>
+
+ Latched scrolling may interact badly with custom programmatic scrolling
+ https://bugs.webkit.org/show_bug.cgi?id=131869
+ <rdar://problem/16249557>
+
+ Reviewed by Darin Adler.
+
+ * dom/Element.cpp:
+ (WebCore::Element::setScrollLeft): Mark scrollable area as having
+ been scrolled programmatically.
+ (WebCore::Element::setScrollTop): Ditto.
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::handleWheelEvent): Check for programmatic scroll, and
+ clear latched state if the handler manually scrolled. Clear programmatic
+ scroll state at the end of event handling.
+ (WebCore::EventHandler::clearLatchedState): Refactored code.
+ * page/EventHandler.h:
+ * page/mac/EventHandlerMac.mm:
+ (WebCore::EventHandler::platformPrepareForWheelEvents): Check
+ if scrollable area was scrolled programmatically. If it was, do
+ not honor latching behavior.
+ * platform/ScrollableArea.cpp:
+ (WebCore::ScrollableArea::ScrollableArea): Initialize new member.
+ * platform/ScrollableArea.h:
+ (WebCore::ScrollableArea::isScrolledProgrammatically): Added.
+ (WebCore::ScrollableArea::setScrolledProgrammatically): Added.
+
</ins><span class="cx"> 2014-04-19 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: grid rows are not recognized do to lack of explicit role="row", role="gridcell"
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (167559 => 167560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2014-04-20 01:38:48 UTC (rev 167559)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-04-20 02:32:48 UTC (rev 167560)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> #include "NodeRenderStyle.h"
</span><span class="cx"> #include "PlatformWheelEvent.h"
</span><span class="cx"> #include "PointerLockController.h"
</span><ins>+#include "RenderLayer.h"
</ins><span class="cx"> #include "RenderNamedFlowFragment.h"
</span><span class="cx"> #include "RenderRegion.h"
</span><span class="cx"> #include "RenderTheme.h"
</span><span class="lines">@@ -798,16 +799,22 @@
</span><span class="cx"> {
</span><span class="cx"> document().updateLayoutIgnorePendingStylesheets();
</span><span class="cx">
</span><del>- if (RenderBox* rend = renderBox())
- rend->setScrollLeft(static_cast<int>(newLeft * rend->style().effectiveZoom()));
</del><ins>+ if (RenderBox* renderer = renderBox()) {
+ renderer->setScrollLeft(static_cast<int>(newLeft * renderer->style().effectiveZoom()));
+ if (auto* scrollableArea = renderer->layer())
+ scrollableArea->setScrolledProgrammatically(true);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Element::setScrollTop(int newTop)
</span><span class="cx"> {
</span><span class="cx"> document().updateLayoutIgnorePendingStylesheets();
</span><span class="cx">
</span><del>- if (RenderBox* rend = renderBox())
- rend->setScrollTop(static_cast<int>(newTop * rend->style().effectiveZoom()));
</del><ins>+ if (RenderBox* renderer = renderBox()) {
+ renderer->setScrollTop(static_cast<int>(newTop * renderer->style().effectiveZoom()));
+ if (auto* scrollableArea = renderer->layer())
+ scrollableArea->setScrolledProgrammatically(true);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int Element::scrollWidth()
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (167559 => 167560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2014-04-20 01:38:48 UTC (rev 167559)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2014-04-20 02:32:48 UTC (rev 167560)
</span><span class="lines">@@ -2593,19 +2593,41 @@
</span><span class="cx"> Widget* widget = toRenderWidget(target)->widget();
</span><span class="cx"> if (widget && passWheelEventToWidget(e, widget)) {
</span><span class="cx"> m_isHandlingWheelEvent = false;
</span><ins>+ if (scrollableArea)
+ scrollableArea->setScrolledProgrammatically(false);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!element->dispatchWheelEvent(event)) {
</span><span class="cx"> m_isHandlingWheelEvent = false;
</span><ins>+
+ if (scrollableArea && scrollableArea->isScrolledProgrammatically()) {
+ // Web developer is controlling scrolling. Don't attempt to latch ourselves:
+ clearLatchedState();
+ scrollableArea->setScrolledProgrammatically(false);
+ }
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (scrollableArea)
+ scrollableArea->setScrolledProgrammatically(false);
+
</ins><span class="cx"> return platformCompleteWheelEvent(e, scrollableContainer, scrollableArea);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void EventHandler::clearLatchedState()
+{
+ m_latchedWheelEventElement = nullptr;
+#if PLATFORM(COCOA)
+ m_latchedScrollableContainer = nullptr;
+#endif
+ m_widgetIsLatched = false;
+ m_previousWheelScrolledElement = nullptr;
+}
+
</ins><span class="cx"> void EventHandler::defaultWheelEventHandler(Node* startNode, WheelEvent* wheelEvent)
</span><span class="cx"> {
</span><span class="cx"> if (!startNode || !wheelEvent)
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.h (167559 => 167560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.h 2014-04-20 01:38:48 UTC (rev 167559)
+++ trunk/Source/WebCore/page/EventHandler.h 2014-04-20 02:32:48 UTC (rev 167560)
</span><span class="lines">@@ -436,6 +436,8 @@
</span><span class="cx"> void autoHideCursorTimerFired(Timer<EventHandler>&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ void clearLatchedState();
+
</ins><span class="cx"> Frame& m_frame;
</span><span class="cx">
</span><span class="cx"> bool m_mousePressed;
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacEventHandlerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (167559 => 167560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2014-04-20 01:38:48 UTC (rev 167559)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2014-04-20 02:32:48 UTC (rev 167560)
</span><span class="lines">@@ -799,10 +799,7 @@
</span><span class="cx"> isOverWidget = m_widgetIsLatched;
</span><span class="cx"> m_recentWheelEventDeltaTracker->beginTrackingDeltas();
</span><span class="cx"> } else if (wheelEvent.shouldResetLatching()) {
</span><del>- m_latchedWheelEventElement = nullptr;
- m_latchedScrollableContainer = nullptr;
- m_widgetIsLatched = false;
- m_previousWheelScrolledElement = nullptr;
</del><ins>+ clearLatchedState();
</ins><span class="cx"> m_recentWheelEventDeltaTracker->endTrackingDeltas();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollableAreacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollableArea.cpp (167559 => 167560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollableArea.cpp 2014-04-20 01:38:48 UTC (rev 167559)
+++ trunk/Source/WebCore/platform/ScrollableArea.cpp 2014-04-20 02:32:48 UTC (rev 167560)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx"> , m_horizontalScrollElasticity(ScrollElasticityNone)
</span><span class="cx"> , m_scrollbarOverlayStyle(ScrollbarOverlayStyleDefault)
</span><span class="cx"> , m_scrollOriginChanged(false)
</span><ins>+ , m_scrolledProgrammatically(false)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollableAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollableArea.h (167559 => 167560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollableArea.h 2014-04-20 01:38:48 UTC (rev 167559)
+++ trunk/Source/WebCore/platform/ScrollableArea.h 2014-04-20 02:32:48 UTC (rev 167560)
</span><span class="lines">@@ -156,6 +156,9 @@
</span><span class="cx"> virtual bool scrolledToLeft() const;
</span><span class="cx"> virtual bool scrolledToRight() const;
</span><span class="cx">
</span><ins>+ bool isScrolledProgrammatically() const { return m_scrolledProgrammatically; }
+ void setScrolledProgrammatically(bool state) { m_scrolledProgrammatically = state; }
+
</ins><span class="cx"> enum VisibleContentRectIncludesScrollbars { ExcludeScrollbars, IncludeScrollbars };
</span><span class="cx"> enum VisibleContentRectBehavior {
</span><span class="cx"> ContentsVisibleRect,
</span><span class="lines">@@ -292,6 +295,7 @@
</span><span class="cx"> unsigned m_scrollbarOverlayStyle : 2; // ScrollbarOverlayStyle
</span><span class="cx">
</span><span class="cx"> unsigned m_scrollOriginChanged : 1;
</span><ins>+ unsigned m_scrolledProgrammatically : 1;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkWebKitxcworkspacexcshareddataxcschemesAllSourcetargetWebProcessxcscheme"></a>
<div class="modfile"><h4>Modified: trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme (167559 => 167560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme 2014-04-20 01:38:48 UTC (rev 167559)
+++ trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme 2014-04-20 02:32:48 UTC (rev 167560)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
</span><span class="cx"> launchStyle = "0"
</span><span class="cx"> useCustomWorkingDirectory = "NO"
</span><del>- buildConfiguration = "Debug"
</del><ins>+ buildConfiguration = "Release"
</ins><span class="cx"> ignoresPersistentStateOnLaunch = "NO"
</span><span class="cx"> debugDocumentVersioning = "YES"
</span><span class="cx"> allowLocationSimulation = "YES">
</span></span></pre>
</div>
</div>
</body>
</html>