<!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>[163329] 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/163329">163329</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-02-03 15:10:31 -0800 (Mon, 03 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/163018">r163018</a>): Can’t scroll in <select> lists
https://bugs.webkit.org/show_bug.cgi?id=128090
Source/WebCore:
The regression was caused by the fact that a new method scrollWithWheelEventLocation() was added
to RenderBox to replace the generic scroll() method for the particular case of scrolling using
the mouse wheel. This turned out to be a mistake because in the case of some elements, like select lists,
the scroll method was overriden and now the incorrect method was being called.
The solution was to remove the new method and just add two default parameters to the generic
scroll method.
Patch by Radu Stavila <stavila@adobe.com> on 2014-02-03
Reviewed by Simon Fraser.
Test: fast/scrolling/scroll-select-list.html
* page/EventHandler.cpp:
(WebCore::scrollNode):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::scroll):
* rendering/RenderBox.h:
* rendering/RenderEmbeddedObject.cpp:
(WebCore::RenderEmbeddedObject::scroll):
* rendering/RenderEmbeddedObject.h:
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::scroll):
* rendering/RenderListBox.h:
* rendering/RenderTextControlSingleLine.cpp:
(WebCore::RenderTextControlSingleLine::scroll):
* rendering/RenderTextControlSingleLine.h:
LayoutTests:
New test validates scrolling using the mouse wheel inside a select list.
This test is for the moment added as a ImageOnlyFailure expectation
because the current implementation of eventSender cannot simulate mouse wheel events.
Patch by Radu Stavila <stavila@adobe.com> on 2014-02-03
Reviewed by Simon Fraser.
* TestExpectations:
* fast/scrolling/scroll-select-list-expected.html: Added.
* fast/scrolling/scroll-select-list.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<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="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxh">trunk/Source/WebCore/rendering/RenderBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderEmbeddedObjectcpp">trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderEmbeddedObjecth">trunk/Source/WebCore/rendering/RenderEmbeddedObject.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxcpp">trunk/Source/WebCore/rendering/RenderListBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxh">trunk/Source/WebCore/rendering/RenderListBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlSingleLinecpp">trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlSingleLineh">trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastscrollingscrollselectlistexpectedhtml">trunk/LayoutTests/fast/scrolling/scroll-select-list-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastscrollingscrollselectlisthtml">trunk/LayoutTests/fast/scrolling/scroll-select-list.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (163328 => 163329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-03 22:43:28 UTC (rev 163328)
+++ trunk/LayoutTests/ChangeLog 2014-02-03 23:10:31 UTC (rev 163329)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-03 Radu Stavila <stavila@adobe.com>
+
+ REGRESSION (r163018): Can’t scroll in <select> lists
+ https://bugs.webkit.org/show_bug.cgi?id=128090
+
+ New test validates scrolling using the mouse wheel inside a select list.
+ This test is for the moment added as a ImageOnlyFailure expectation
+ because the current implementation of eventSender cannot simulate mouse wheel events.
+
+ Reviewed by Simon Fraser.
+
+ * TestExpectations:
+ * fast/scrolling/scroll-select-list-expected.html: Added.
+ * fast/scrolling/scroll-select-list.html: Added.
+
</ins><span class="cx"> 2014-02-03 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Deconstructed parameters aren't being placed in the correct scope
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (163328 => 163329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2014-02-03 22:43:28 UTC (rev 163328)
+++ trunk/LayoutTests/TestExpectations 2014-02-03 23:10:31 UTC (rev 163329)
</span><span class="lines">@@ -2,6 +2,9 @@
</span><span class="cx"> #
</span><span class="cx"> # See http://trac.webkit.org/wiki/TestExpectations for more information on this file.
</span><span class="cx">
</span><ins>+# Incomplete implementation of eventSender causes this test to fail
+webkit.org/b/42194 fast/scrolling/scroll-select-list.html [ ImageOnlyFailure ]
+
</ins><span class="cx"> # pending functional patch and per-port verification
</span><span class="cx"> webkit.org/b/109954 css3/line-break [ Skip ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingscrollselectlistexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/scrolling/scroll-select-list-expected.html (0 => 163329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/scroll-select-list-expected.html (rev 0)
+++ trunk/LayoutTests/fast/scrolling/scroll-select-list-expected.html 2014-02-03 23:10:31 UTC (rev 163329)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<!DOCTYPE html>
+<style>
+
+</style>
+
+<script type="text/javascript">
+ onload = function() {
+ var selectList = document.getElementById("list");
+ selectList.scrollTop = 84;
+ }
+</script>
+
+<body style="font: 16px/16px monospace;">
+ <p>Scrolling inside the list using the mouse wheel should work as expected<br/>
+ <select id="list" size="2">
+ <option>content1</option>
+ <option>content2</option>
+ <option>content3</option>
+ <option>content4</option>
+ <option>content5</option>
+ <option>content6</option>
+ <option>content7</option>
+ <option>content8</option>
+ <option>content9</option>
+ <option>content10</option>
+ </select>
+</body>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastscrollingscrollselectlisthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/scrolling/scroll-select-list.html (0 => 163329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/scroll-select-list.html (rev 0)
+++ trunk/LayoutTests/fast/scrolling/scroll-select-list.html 2014-02-03 23:10:31 UTC (rev 163329)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+
+<script>
+ onload = function() {
+ if (window.eventSender) {
+ var selectList = document.getElementById("list");
+ var left = selectList.offsetLeft;
+ var top = selectList.offsetTop;
+
+ // scroll the list all the way down
+ eventSender.mouseMoveTo(left + 10, top + 10);
+ eventSender.continuousMouseScrollBy(0, -10000);
+ eventSender.mouseMoveTo(0, 0);
+ }
+ }
+</script>
+
+<body style="font: 16px/16px monospace;">
+ <p>Scrolling inside the list using the mouse wheel should work as expected<br/>
+ <select id="list" size="2">
+ <option>content1</option>
+ <option>content2</option>
+ <option>content3</option>
+ <option>content4</option>
+ <option>content5</option>
+ <option>content6</option>
+ <option>content7</option>
+ <option>content8</option>
+ <option>content9</option>
+ <option>content10</option>
+ </select>
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163328 => 163329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-03 22:43:28 UTC (rev 163328)
+++ trunk/Source/WebCore/ChangeLog 2014-02-03 23:10:31 UTC (rev 163329)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-02-03 Radu Stavila <stavila@adobe.com>
+
+ REGRESSION (r163018): Can’t scroll in <select> lists
+ https://bugs.webkit.org/show_bug.cgi?id=128090
+
+ The regression was caused by the fact that a new method scrollWithWheelEventLocation() was added
+ to RenderBox to replace the generic scroll() method for the particular case of scrolling using
+ the mouse wheel. This turned out to be a mistake because in the case of some elements, like select lists,
+ the scroll method was overriden and now the incorrect method was being called.
+ The solution was to remove the new method and just add two default parameters to the generic
+ scroll method.
+
+ Reviewed by Simon Fraser.
+
+ Test: fast/scrolling/scroll-select-list.html
+
+ * page/EventHandler.cpp:
+ (WebCore::scrollNode):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::scroll):
+ * rendering/RenderBox.h:
+ * rendering/RenderEmbeddedObject.cpp:
+ (WebCore::RenderEmbeddedObject::scroll):
+ * rendering/RenderEmbeddedObject.h:
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::scroll):
+ * rendering/RenderListBox.h:
+ * rendering/RenderTextControlSingleLine.cpp:
+ (WebCore::RenderTextControlSingleLine::scroll):
+ * rendering/RenderTextControlSingleLine.h:
+
</ins><span class="cx"> 2014-02-03 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: WebKit should support @headers/@id for complex accessible web tables
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (163328 => 163329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2014-02-03 22:43:28 UTC (rev 163328)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2014-02-03 23:10:31 UTC (rev 163329)
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool scrollNode(float delta, ScrollGranularity granularity, ScrollDirection positiveDirection, ScrollDirection negativeDirection, Node* node, Element** stopElement, const IntPoint& absolutePoint)
</del><ins>+static inline bool scrollNode(float delta, ScrollGranularity granularity, ScrollDirection positiveDirection, ScrollDirection negativeDirection, Node* node, Element** stopElement, const IntPoint& wheelEventAbsolutePoint)
</ins><span class="cx"> {
</span><span class="cx"> if (!delta)
</span><span class="cx"> return false;
</span><span class="lines">@@ -290,7 +290,7 @@
</span><span class="cx"> RenderBox* enclosingBox = node->renderer()->enclosingBox();
</span><span class="cx"> float absDelta = delta > 0 ? delta : -delta;
</span><span class="cx">
</span><del>- return enclosingBox->scrollWithWheelEventLocation(delta < 0 ? negativeDirection : positiveDirection, granularity, absDelta, enclosingBox, stopElement, absolutePoint);
</del><ins>+ return enclosingBox->scroll(delta < 0 ? negativeDirection : positiveDirection, granularity, absDelta, stopElement, enclosingBox, wheelEventAbsolutePoint);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if (ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS))
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (163328 => 163329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-02-03 22:43:28 UTC (rev 163328)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-02-03 23:10:31 UTC (rev 163329)
</span><span class="lines">@@ -768,7 +768,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderBox::scroll(ScrollDirection direction, ScrollGranularity granularity, float multiplier, Element** stopElement)
</del><ins>+bool RenderBox::scroll(ScrollDirection direction, ScrollGranularity granularity, float multiplier, Element** stopElement, RenderBox* startBox, const IntPoint& wheelEventAbsolutePoint)
</ins><span class="cx"> {
</span><span class="cx"> if (scrollLayer(direction, granularity, multiplier, stopElement))
</span><span class="cx"> return true;
</span><span class="lines">@@ -776,29 +776,14 @@
</span><span class="cx"> if (stopElement && *stopElement && *stopElement == element())
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- RenderBlock* b = containingBlock();
- if (b && !b->isRenderView())
- return b->scroll(direction, granularity, multiplier, stopElement);
-
- return false;
-}
-
-bool RenderBox::scrollWithWheelEventLocation(ScrollDirection direction, ScrollGranularity granularity, float multiplier, RenderBox* startBox, Element** stopElement, IntPoint absolutePoint)
-{
- if (scrollLayer(direction, granularity, multiplier, stopElement))
- return true;
-
- if (stopElement && *stopElement && *stopElement == element())
- return true;
-
</del><span class="cx"> RenderBlock* nextScrollBlock = containingBlock();
</span><span class="cx"> if (nextScrollBlock && nextScrollBlock->isRenderNamedFlowThread()) {
</span><span class="cx"> ASSERT(startBox);
</span><del>- nextScrollBlock = toRenderFlowThread(nextScrollBlock)->regionFromAbsolutePointAndBox(absolutePoint, *startBox);
</del><ins>+ nextScrollBlock = toRenderFlowThread(nextScrollBlock)->regionFromAbsolutePointAndBox(wheelEventAbsolutePoint, *startBox);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (nextScrollBlock && !nextScrollBlock->isRenderView())
</span><del>- return nextScrollBlock->scrollWithWheelEventLocation(direction, granularity, multiplier, startBox, stopElement, absolutePoint);
</del><ins>+ return nextScrollBlock->scroll(direction, granularity, multiplier, stopElement, startBox, wheelEventAbsolutePoint);
</ins><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (163328 => 163329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h 2014-02-03 22:43:28 UTC (rev 163328)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2014-02-03 23:10:31 UTC (rev 163329)
</span><span class="lines">@@ -452,8 +452,7 @@
</span><span class="cx"> int horizontalScrollbarHeight() const;
</span><span class="cx"> int instrinsicScrollbarLogicalWidth() const;
</span><span class="cx"> int scrollbarLogicalHeight() const { return style().isHorizontalWritingMode() ? horizontalScrollbarHeight() : verticalScrollbarWidth(); }
</span><del>- virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = 0);
- virtual bool scrollWithWheelEventLocation(ScrollDirection, ScrollGranularity, float multiplier, RenderBox* startBox, Element** stopElement, IntPoint absolutePoint);
</del><ins>+ virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = nullptr, RenderBox* startBox = nullptr, const IntPoint& wheelEventAbsolutePoint = IntPoint());
</ins><span class="cx"> virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = 0);
</span><span class="cx"> bool canBeScrolledAndHasScrollableArea() const;
</span><span class="cx"> virtual bool canBeProgramaticallyScrolled() const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderEmbeddedObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp (163328 => 163329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2014-02-03 22:43:28 UTC (rev 163328)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2014-02-03 23:10:31 UTC (rev 163329)
</span><span class="lines">@@ -567,7 +567,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderEmbeddedObject::scroll(ScrollDirection direction, ScrollGranularity granularity, float, Element**)
</del><ins>+bool RenderEmbeddedObject::scroll(ScrollDirection direction, ScrollGranularity granularity, float, Element**, RenderBox*, const IntPoint&)
</ins><span class="cx"> {
</span><span class="cx"> if (!widget() || !widget()->isPluginViewBase())
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderEmbeddedObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.h (163328 => 163329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.h 2014-02-03 22:43:28 UTC (rev 163328)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.h 2014-02-03 23:10:31 UTC (rev 163329)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override final;
</span><span class="cx">
</span><del>- virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier, Element** stopElement) override final;
</del><ins>+ virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = nullptr, RenderBox* startBox = nullptr, const IntPoint& wheelEventAbsolutePoint = IntPoint()) override final;
</ins><span class="cx"> virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier, Element** stopElement) override final;
</span><span class="cx">
</span><span class="cx"> void setUnavailablePluginIndicatorIsPressed(bool);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (163328 => 163329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2014-02-03 22:43:28 UTC (rev 163328)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2014-02-03 23:10:31 UTC (rev 163329)
</span><span class="lines">@@ -592,7 +592,7 @@
</span><span class="cx"> return index >= m_indexOffset && index < m_indexOffset + numVisibleItems();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderListBox::scroll(ScrollDirection direction, ScrollGranularity granularity, float multiplier, Element**)
</del><ins>+bool RenderListBox::scroll(ScrollDirection direction, ScrollGranularity granularity, float multiplier, Element**, RenderBox*, const IntPoint&)
</ins><span class="cx"> {
</span><span class="cx"> return ScrollableArea::scroll(direction, granularity, multiplier);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.h (163328 => 163329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.h 2014-02-03 22:43:28 UTC (rev 163328)
+++ trunk/Source/WebCore/rendering/RenderListBox.h 2014-02-03 23:10:31 UTC (rev 163329)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx">
</span><span class="cx"> virtual bool isPointInOverflowControl(HitTestResult&, const LayoutPoint& locationInContainer, const LayoutPoint& accumulatedOffset) override;
</span><span class="cx">
</span><del>- virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = 0) override;
</del><ins>+ virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = nullptr, RenderBox* startBox = nullptr, const IntPoint& wheelEventAbsolutePoint = IntPoint()) override;
</ins><span class="cx"> virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = 0) override;
</span><span class="cx">
</span><span class="cx"> virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlSingleLinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp (163328 => 163329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp 2014-02-03 22:43:28 UTC (rev 163328)
+++ trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp 2014-02-03 23:10:31 UTC (rev 163329)
</span><span class="lines">@@ -460,7 +460,7 @@
</span><span class="cx"> innerTextElement()->setScrollTop(newTop);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderTextControlSingleLine::scroll(ScrollDirection direction, ScrollGranularity granularity, float multiplier, Element** stopElement)
</del><ins>+bool RenderTextControlSingleLine::scroll(ScrollDirection direction, ScrollGranularity granularity, float multiplier, Element** stopElement, RenderBox* startBox, const IntPoint& wheelEventAbsolutePoint)
</ins><span class="cx"> {
</span><span class="cx"> RenderTextControlInnerBlock* renderer = innerTextElement()->renderer();
</span><span class="cx"> if (!renderer)
</span><span class="lines">@@ -468,7 +468,7 @@
</span><span class="cx"> RenderLayer* layer = renderer->layer();
</span><span class="cx"> if (layer && layer->scroll(direction, granularity, multiplier))
</span><span class="cx"> return true;
</span><del>- return RenderBlockFlow::scroll(direction, granularity, multiplier, stopElement);
</del><ins>+ return RenderBlockFlow::scroll(direction, granularity, multiplier, stopElement, startBox, wheelEventAbsolutePoint);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderTextControlSingleLine::logicalScroll(ScrollLogicalDirection direction, ScrollGranularity granularity, float multiplier, Element** stopElement)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlSingleLineh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h (163328 => 163329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h 2014-02-03 22:43:28 UTC (rev 163328)
+++ trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h 2014-02-03 23:10:31 UTC (rev 163329)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> virtual int scrollHeight() const override;
</span><span class="cx"> virtual void setScrollLeft(int) override;
</span><span class="cx"> virtual void setScrollTop(int) override;
</span><del>- virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = 0) override final;
</del><ins>+ virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = nullptr, RenderBox* startBox = nullptr, const IntPoint& wheelEventAbsolutePoint = IntPoint()) override final;
</ins><span class="cx"> virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = 0) override final;
</span><span class="cx">
</span><span class="cx"> int textBlockWidth() const;
</span></span></pre>
</div>
</div>
</body>
</html>