<!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>[172242] branches/safari-600.1-branch</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/172242">172242</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-08-07 13:33:04 -0700 (Thu, 07 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172160">r172160</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestsChangeLog">branches/safari-600.1-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCorerenderingRenderLayercpp">branches/safari-600.1-branch/Source/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestsplatformmacfastscrollingscrolllatchednesteddivexpectedtxt">branches/safari-600.1-branch/LayoutTests/platform/mac/fast/scrolling/scroll-latched-nested-div-expected.txt</a></li>
<li><a href="#branchessafari6001branchLayoutTestsplatformmacfastscrollingscrolllatchednesteddivhtml">branches/safari-600.1-branch/LayoutTests/platform/mac/fast/scrolling/scroll-latched-nested-div.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/ChangeLog (172241 => 172242)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-08-07 20:31:41 UTC (rev 172241)
+++ branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-08-07 20:33:04 UTC (rev 172242)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-08-07 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172160
+
+ 2014-08-06 Brent Fulgham <bfulgham@apple.com>
+
+ [Mac] Unable to scroll to bottom of nested scrollable areas
+ https://bugs.webkit.org/show_bug.cgi?id=135637
+ <rdar://problem/17910241>
+
+ Reviewed by Zalan Bujtas.
+
+ * platform/mac/fast/scrolling/scroll-latched-nested-div-expected.txt: Added.
+ * platform/mac/fast/scrolling/scroll-latched-nested-div.html: Added.
+
+2014-08-07 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r172112
</span><span class="cx">
</span><span class="cx"> 2014-08-05 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchLayoutTestsplatformmacfastscrollingscrolllatchednesteddivexpectedtxtfromrev172160trunkLayoutTestsplatformmacfastscrollingscrolllatchednesteddivexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/platform/mac/fast/scrolling/scroll-latched-nested-div-expected.txt (from rev 172160, trunk/LayoutTests/platform/mac/fast/scrolling/scroll-latched-nested-div-expected.txt) (0 => 172242)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/platform/mac/fast/scrolling/scroll-latched-nested-div-expected.txt (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/platform/mac/fast/scrolling/scroll-latched-nested-div-expected.txt 2014-08-07 20:33:04 UTC (rev 172242)
</span><span class="lines">@@ -0,0 +1,66 @@
</span><ins>+Put mouse next to the table labeled 'Scrollable Region' and flick downward. The scroll movement should come to a halt. Then flick again. The overall page should scroll.
+Scrollable Region
+
+Count DATA Rev Count
+TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP
+1 0.1100 40
+2 0.1155 39
+3 0.2200 38
+4 0.2255 37
+5 0.3300 36
+6 0.3355 35
+7 0.4400 34
+8 0.4455 33
+9 0.5500 32
+10 0.5555 31
+11 0.6600 30
+12 0.6655 29
+13 0.7700 28
+14 0.7755 27
+15 0.8800 26
+16 0.8855 25
+17 0.9900 24
+18 0.9955 23
+19 0.9999 22
+20 1.0000 21
+21 1.0000 20
+22 0.9999 19
+23 0.9955 18
+24 0.9900 17
+25 0.8855 16
+26 0.8800 15
+27 0.7755 14
+28 0.7700 13
+29 0.6655 12
+30 0.6600 11
+31 0.5555 10
+32 0.5500 9
+33 0.4455 8
+34 0.4400 7
+35 0.3355 6
+36 0.3300 5
+37 0.2255 4
+38 0.2200 3
+39 0.1155 2
+40 0.1100 1
+END END END END END END END END END END END END END END END
+A set of information at the bottom of the table.
+
+Tests that a scrollable div nested inside another scrollable div properly handles wheel events under sub-pixel conditions.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+wrapperTarget = [object HTMLDivElement]
+First scroll event:
+PASS Page did not receive wheel events during the first gesture.
+PASS Wrapper received wheel events during the first gesture.
+PASS div did not receive wheel events during the first gesture.
+Second scroll event:
+PASS Page received wheel events during the second gesture.
+PASS Wrapper did not receive wheel events during the second gesture.
+PASS div did not receive wheel events during the second gesture.
+
</ins></span></pre></div>
<a id="branchessafari6001branchLayoutTestsplatformmacfastscrollingscrolllatchednesteddivhtmlfromrev172160trunkLayoutTestsplatformmacfastscrollingscrolllatchednesteddivhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/platform/mac/fast/scrolling/scroll-latched-nested-div.html (from rev 172160, trunk/LayoutTests/platform/mac/fast/scrolling/scroll-latched-nested-div.html) (0 => 172242)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/platform/mac/fast/scrolling/scroll-latched-nested-div.html (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/platform/mac/fast/scrolling/scroll-latched-nested-div.html 2014-08-07 20:33:04 UTC (rev 172242)
</span><span class="lines">@@ -0,0 +1,224 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+.scrollable_region {
+ width: 680px;
+}
+
+.table td, .table th {
+ padding: 2px;
+}
+
+.table th {
+ height: 20px;
+ text-align: left;
+ font-weight: strong;
+}
+
+.table tr:nth-child(odd) {
+ background: #f3f3f3;
+}
+
+.scrollable_select option:nth-child(odd) {
+ background: #f3f3f3;
+}
+
+</style>
+<script src="../../../../resources/js-test-pre.js"></script>
+<script>
+function onLoad() {
+ setupTopLevel();
+}
+</script>
+</head>
+<body onload="onLoad();">
+<script>
+
+var wrapperTarget;
+var divTarget;
+var pageScrollPositionBefore;
+var wrapperScrollPositionBefore;
+var divScrollPositionBefore;
+var continueCount = 5;
+
+function checkForSecondScroll() {
+ // 'parent' should have scrolled, the content of 'target' should
+ // not have scrolled, and 'wrapper' should not have scrolled.
+ var pageScrollPositionAfter = document.body.scrollTop;
+ var wrapperScrollPositionAfter = wrapperTarget.scrollTop;
+ var divScrollPositionAfter = divTarget.scrollTop;
+
+ debug("Second scroll event:");
+ if (pageScrollPositionBefore != pageScrollPositionAfter)
+ testPassed("Page received wheel events during the second gesture.");
+ else
+ testFailed("Page did not receive wheel events during the second gesture.");
+
+ if (wrapperScrollPositionBefore != wrapperScrollPositionAfter)
+ testFailed("Wrapper received wheel events during the second gesture.");
+ else
+ testPassed("Wrapper did not receive wheel events during the second gesture.");
+
+ if (divScrollPositionBefore != divScrollPositionAfter)
+ testFailed("div received wheel events during the second gesture.");
+ else
+ testPassed("div did not receive wheel events during the second gesture.");
+
+ testRunner.notifyDone();
+}
+
+function checkForFirstScroll() {
+ // 'parent' should not have scrolled, and the content of 'target' should
+ // not have moved. However, 'wrapper' should have moved.
+ var pageScrollPositionAfter = document.body.scrollTop;
+ var wrapperScrollPositionAfter = wrapperTarget.scrollTop;
+ var divScrollPositionAfter = divTarget.scrollTop;
+
+ debug("First scroll event:");
+ if (pageScrollPositionBefore != pageScrollPositionAfter)
+ testFailed("Page received wheel events during the first gesture.");
+ else
+ testPassed("Page did not receive wheel events during the first gesture.");
+
+ if (wrapperScrollPositionBefore != wrapperScrollPositionAfter)
+ testPassed("Wrapper received wheel events during the first gesture.");
+ else
+ testFailed("Wrapper did not receive wheel events during the first gesture.");
+
+ if (divScrollPositionBefore != divScrollPositionAfter)
+ testFailed("div received wheel events during the first gesture.");
+ else
+ testPassed("div did not receive wheel events during the first gesture.");
+
+ wrapperScrollPositionBefore = wrapperTarget.scrollTop;
+
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
+ setTimeout(checkForSecondScroll, 100);
+}
+
+function scrollTest() {
+ // See where our IFrame lives:
+ pageScrollPositionBefore = document.body.scrollTop;
+
+ divTarget = document.getElementById('target');
+ divTarget.scrollTop = divTarget.scrollHeight - divTarget.clientHeight - 100;
+
+ divScrollPositionBefore = divTarget.scrollTop;
+
+ wrapperTarget = document.getElementById('wrapper');
+ wrapperScrollPositionBefore = wrapperTarget.scrollTop;
+ debug("wrapperTarget = " + wrapperTarget);
+
+ // Move mouse to a position to the right side of the table, and near the bottom.
+ var startPosX = divTarget.offsetLeft + divTarget.clientWidth + 50;
+ var startPosY = Math.round(divTarget.offsetTop) - 42; // One wheel turn before end.
+ eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -5, 'none', 'begin', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -5, 'none', 'continue', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -5, 'none', 'continue', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -5, 'none', 'continue', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -5, 'none', 'continue', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
+ setTimeout(checkForFirstScroll, 100);
+}
+
+function setupTopLevel() {
+
+ if (window.eventSender) {
+ testRunner.waitUntilDone();
+
+ setTimeout(scrollTest, 1000);
+ } else {
+ var messageLocation = document.getElementById('parent');
+ var message = document.createElement('div');
+ message.innerHTML = "<p>This test is better run under DumpRenderTree. To manually test it, place the mouse pointer<br/>"
+ + "at the top of the page, and then use the mouse wheel or a two-finger swipe to scroll the<br/>"
+ + "down past the div.<br/><br/>"
+ + "You should not see the row of END labels if this test is successful.</p>";
+ messageLocation.appendChild(message);
+ }
+}
+
+</script>
+<div id="parent" style="height: 2000px; width: 800px;">
+ <div id="wrapper" style='overflow-y: auto; overflow-x: hidden; max-height: 600px;'>
+ <div id="source" style="height: 100px; width: 600px;">
+ Put mouse next to the table labeled 'Scrollable Region' and flick downward. The scroll movement
+ should come to a halt. Then flick again. The overall page should scroll.
+ </div>
+ <div class="scrollable_region">
+ <h3>Scrollable Region</h3>
+ <div id="target" style='overflow-y: auto; overflow-x: hidden; max-height: 485.55px;'>
+ <table class="table" style='width: 99%'>
+ <tr><th>Count</th><th>DATA</th><th>Rev Count</th></tr>
+ <tr><td>TOP TOP TOP TOP TOP</td><td>TOP TOP TOP TOP TOP</td><td>TOP TOP TOP TOP TOP</td></tr>
+ <tr><td>1</td><td>0.1100</td><td>40</td></tr>
+ <tr><td>2</td><td>0.1155</td><td>39</td></tr>
+ <tr><td>3</td><td>0.2200</td><td>38</td></tr>
+ <tr><td>4</td><td>0.2255</td><td>37</td></tr>
+ <tr><td>5</td><td>0.3300</td><td>36</td></tr>
+ <tr><td>6</td><td>0.3355</td><td>35</td></tr>
+ <tr><td>7</td><td>0.4400</td><td>34</td></tr>
+ <tr><td>8</td><td>0.4455</td><td>33</td></tr>
+ <tr><td>9</td><td>0.5500</td><td>32</td></tr>
+ <tr><td>10</td><td>0.5555</td><td>31</td></tr>
+ <tr><td>11</td><td>0.6600</td><td>30</td></tr>
+ <tr><td>12</td><td>0.6655</td><td>29</td></tr>
+ <tr><td>13</td><td>0.7700</td><td>28</td></tr>
+ <tr><td>14</td><td>0.7755</td><td>27</td></tr>
+ <tr><td>15</td><td>0.8800</td><td>26</td></tr>
+ <tr><td>16</td><td>0.8855</td><td>25</td></tr>
+ <tr><td>17</td><td>0.9900</td><td>24</td></tr>
+ <tr><td>18</td><td>0.9955</td><td>23</td></tr>
+ <tr><td>19</td><td>0.9999</td><td>22</td></tr>
+ <tr><td>20</td><td>1.0000</td><td>21</td></tr>
+ <tr><td>21</td><td>1.0000</td><td>20</td></tr>
+ <tr><td>22</td><td>0.9999</td><td>19</td></tr>
+ <tr><td>23</td><td>0.9955</td><td>18</td></tr>
+ <tr><td>24</td><td>0.9900</td><td>17</td></tr>
+ <tr><td>25</td><td>0.8855</td><td>16</td></tr>
+ <tr><td>26</td><td>0.8800</td><td>15</td></tr>
+ <tr><td>27</td><td>0.7755</td><td>14</td></tr>
+ <tr><td>28</td><td>0.7700</td><td>13</td></tr>
+ <tr><td>29</td><td>0.6655</td><td>12</td></tr>
+ <tr><td>30</td><td>0.6600</td><td>11</td></tr>
+ <tr><td>31</td><td>0.5555</td><td>10</td></tr>
+ <tr><td>32</td><td>0.5500</td><td>9</td></tr>
+ <tr><td>33</td><td>0.4455</td><td>8</td></tr>
+ <tr><td>34</td><td>0.4400</td><td>7</td></tr>
+ <tr><td>35</td><td>0.3355</td><td>6</td></tr>
+ <tr><td>36</td><td>0.3300</td><td>5</td></tr>
+ <tr><td>37</td><td>0.2255</td><td>4</td></tr>
+ <tr><td>38</td><td>0.2200</td><td>3</td></tr>
+ <tr><td>39</td><td>0.1155</td><td>2</td></tr>
+ <tr><td>40</td><td>0.1100</td><td>1</td></tr>
+ <tr><td>END END END END END</td><td>END END END END END</td><td>END END END END END</td></tr>
+ </table>
+ </div>
+ <div id="bottom" style="height: 100px; width: 600px;">
+ <p>A set of information at the bottom of the table.</p>
+ </div>
+ </div>
+ </div>
+</div>
+<div id="console"></div>
+<script>
+description("Tests that a scrollable div nested inside another scrollable div properly handles wheel events under sub-pixel conditions.");
+</script>
+<script src="../../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172241 => 172242)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-07 20:31:41 UTC (rev 172241)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-07 20:33:04 UTC (rev 172242)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2014-08-07 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172160
+
+ 2014-08-05 Brent Fulgham <bfulgham@apple.com>
+
+ [Mac] Unable to scroll to bottom of nested scrollable areas
+ https://bugs.webkit.org/show_bug.cgi?id=135637
+ <rdar://problem/17910241>
+
+ Reviewed by Zalan Bujtas.
+
+ Test: platform/mac/fast/scrolling/scroll-latched-nested-div.html
+
+ Avoid truncating the fractional portion of scroll ranges.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::updateScrollbarsAfterLayout): Round
+ the LayoutUnit values for scroll width and height rather than
+ truncating.
+
+2014-08-07 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r172159
</span><span class="cx">
</span><span class="cx"> 2014-08-06 Andy Estes <aestes@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/rendering/RenderLayer.cpp (172241 => 172242)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/rendering/RenderLayer.cpp 2014-08-07 20:31:41 UTC (rev 172241)
+++ branches/safari-600.1-branch/Source/WebCore/rendering/RenderLayer.cpp 2014-08-07 20:33:04 UTC (rev 172242)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Portions are Copyright (C) 1998 Netscape Communications Corporation.
</span><span class="cx"> *
</span><span class="lines">@@ -3245,13 +3245,13 @@
</span><span class="cx"> int clientWidth = box->pixelSnappedClientWidth();
</span><span class="cx"> int pageStep = std::max(std::max<int>(clientWidth * Scrollbar::minFractionToStepWhenPaging(), clientWidth - Scrollbar::maxOverlapBetweenPages()), 1);
</span><span class="cx"> m_hBar->setSteps(Scrollbar::pixelsPerLineStep(), pageStep);
</span><del>- m_hBar->setProportion(clientWidth, m_scrollSize.width());
</del><ins>+ m_hBar->setProportion(clientWidth, m_scrollSize.width().round());
</ins><span class="cx"> }
</span><span class="cx"> if (m_vBar) {
</span><span class="cx"> int clientHeight = box->pixelSnappedClientHeight();
</span><span class="cx"> int pageStep = std::max(std::max<int>(clientHeight * Scrollbar::minFractionToStepWhenPaging(), clientHeight - Scrollbar::maxOverlapBetweenPages()), 1);
</span><span class="cx"> m_vBar->setSteps(Scrollbar::pixelsPerLineStep(), pageStep);
</span><del>- m_vBar->setProportion(clientHeight, m_scrollSize.height());
</del><ins>+ m_vBar->setProportion(clientHeight, m_scrollSize.height().round());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> updateScrollableAreaSet(hasScrollableHorizontalOverflow() || hasScrollableVerticalOverflow());
</span></span></pre>
</div>
</div>
</body>
</html>