<!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>[194676] branches/safari-601-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/194676">194676</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-06 15:50:41 -0800 (Wed, 06 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/194404">r194404</a>. rdar://problem/23982006</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCorerenderingRenderBoxcpp">branches/safari-601-branch/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorerenderingRenderBoxh">branches/safari-601-branch/Source/WebCore/rendering/RenderBox.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsfastoverflowoverflowhiddenscrollintoviewexpectedhtml">branches/safari-601-branch/LayoutTests/fast/overflow/overflow-hidden-scroll-into-view-expected.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastoverflowoverflowhiddenscrollintoviewhtml">branches/safari-601-branch/LayoutTests/fast/overflow/overflow-hidden-scroll-into-view.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (194675 => 194676)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2016-01-06 23:50:37 UTC (rev 194675)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2016-01-06 23:50:41 UTC (rev 194676)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-01-06 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r194404. rdar://problem/23982006
+
+ 2015-12-22 Simon Fraser <simon.fraser@apple.com>
+
+ Minor cleanup in RenderBox::canBeProgramaticallyScrolled()
+ https://bugs.webkit.org/show_bug.cgi?id=152515
+
+ Reviewed by Tim Horton.
+
+ Test that programmatic scrolling works inside overflow:hidden.
+
+ * fast/overflow/overflow-hidden-scroll-into-view-expected.html: Added.
+ * fast/overflow/overflow-hidden-scroll-into-view.html: Added.
+
+2016-01-06 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r194114. rdar://problem/23982010
</span><span class="cx">
</span><span class="cx"> 2015-12-15 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastoverflowoverflowhiddenscrollintoviewexpectedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/fast/overflow/overflow-hidden-scroll-into-view-expected.html (0 => 194676)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/overflow/overflow-hidden-scroll-into-view-expected.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/overflow/overflow-hidden-scroll-into-view-expected.html 2016-01-06 23:50:41 UTC (rev 194676)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <title>Tests that scrollIntoView() works inside overflow:hidden</title>
+ <style>
+ .container {
+ height: 200px;
+ width: 200px;
+ border: 1px solid black;
+ background-color: red;
+ }
+
+ #box {
+ height: 200px;
+ width: 200px;
+ background-color: green;
+ }
+ </style>
+</head>
+<body>
+<div class="container">
+ <div id="box"></div>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastoverflowoverflowhiddenscrollintoviewhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/fast/overflow/overflow-hidden-scroll-into-view.html (0 => 194676)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/overflow/overflow-hidden-scroll-into-view.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/overflow/overflow-hidden-scroll-into-view.html 2016-01-06 23:50:41 UTC (rev 194676)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <title>Tests that scrollIntoView() works inside overflow:hidden</title>
+ <style>
+ .container {
+ height: 200px;
+ width: 200px;
+ overflow: hidden;
+ border: 1px solid black;
+ background-color: red;
+ }
+
+ #box {
+ margin-top: 500px;
+ height: 200px;
+ width: 200px;
+ background-color: green;
+ }
+ </style>
+ <script>
+ function doTest()
+ {
+ var box = document.getElementById('box');
+ box.scrollIntoView();
+ }
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+<div class="container">
+ <div id="box"></div>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (194675 => 194676)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-06 23:50:37 UTC (rev 194675)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-01-06 23:50:41 UTC (rev 194676)
</span><span class="lines">@@ -1,5 +1,36 @@
</span><span class="cx"> 2016-01-06 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r194404. rdar://problem/23982006
+
+ 2015-12-22 Simon Fraser <simon.fraser@apple.com>
+
+ Minor cleanup in RenderBox::canBeProgramaticallyScrolled()
+ https://bugs.webkit.org/show_bug.cgi?id=152515
+
+ Reviewed by Tim Horton.
+
+ Remove the scrollsOverflow() check in RenderBox::canBeProgramaticallyScrolled(),
+ since if hasScrollableOverflow is true, scrollsOverflow() must also be true.
+
+ Factor clientWidth/Height vs. scrollWidth/Height checks into separate functions,
+ and call them from two places.
+
+ Added a test which is not affected by this particular change, but will verify
+ that a later change doesn't break anything.
+
+ Test: fast/overflow/overflow-hidden-scroll-into-view.html
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::canBeScrolledAndHasScrollableArea):
+ (WebCore::RenderBox::canBeProgramaticallyScrolled):
+ * rendering/RenderBox.h:
+ (WebCore::RenderBox::hasHorizontalOverflow):
+ (WebCore::RenderBox::hasVerticalOverflow):
+ (WebCore::RenderBox::hasScrollableOverflowX):
+ (WebCore::RenderBox::hasScrollableOverflowY):
+
+2016-01-06 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r194114. rdar://problem/23982010
</span><span class="cx">
</span><span class="cx"> 2015-12-15 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/rendering/RenderBox.cpp (194675 => 194676)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/rendering/RenderBox.cpp 2016-01-06 23:50:37 UTC (rev 194675)
+++ branches/safari-601-branch/Source/WebCore/rendering/RenderBox.cpp 2016-01-06 23:50:41 UTC (rev 194676)
</span><span class="lines">@@ -885,7 +885,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderBox::canBeScrolledAndHasScrollableArea() const
</span><span class="cx"> {
</span><del>- return canBeProgramaticallyScrolled() && (scrollHeight() != roundToInt(clientHeight()) || scrollWidth() != roundToInt(clientWidth()));
</del><ins>+ return canBeProgramaticallyScrolled() && (hasHorizontalOverflow() || hasVerticalOverflow());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderBox::isScrollableOrRubberbandableBox() const
</span><span class="lines">@@ -901,8 +901,7 @@
</span><span class="cx"> if (!hasOverflowClip())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- bool hasScrollableOverflow = hasScrollableOverflowX() || hasScrollableOverflowY();
- if (scrollsOverflow() && hasScrollableOverflow)
</del><ins>+ if (hasScrollableOverflowX() || hasScrollableOverflowY())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return element() && element()->hasEditableStyle();
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/rendering/RenderBox.h (194675 => 194676)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/rendering/RenderBox.h 2016-01-06 23:50:37 UTC (rev 194675)
+++ branches/safari-601-branch/Source/WebCore/rendering/RenderBox.h 2016-01-06 23:50:41 UTC (rev 194676)
</span><span class="lines">@@ -474,12 +474,17 @@
</span><span class="cx">
</span><span class="cx"> bool hasVerticalScrollbarWithAutoBehavior() const;
</span><span class="cx"> bool hasHorizontalScrollbarWithAutoBehavior() const;
</span><ins>+
</ins><span class="cx"> bool scrollsOverflow() const { return scrollsOverflowX() || scrollsOverflowY(); }
</span><span class="cx"> bool scrollsOverflowX() const { return hasOverflowClip() && (style().overflowX() == OSCROLL || hasHorizontalScrollbarWithAutoBehavior()); }
</span><span class="cx"> bool scrollsOverflowY() const { return hasOverflowClip() && (style().overflowY() == OSCROLL || hasVerticalScrollbarWithAutoBehavior()); }
</span><del>- bool hasScrollableOverflowX() const { return scrollsOverflowX() && scrollWidth() != roundToInt(clientWidth()); }
- bool hasScrollableOverflowY() const { return scrollsOverflowY() && scrollHeight() != roundToInt(clientHeight()); }
</del><span class="cx">
</span><ins>+ bool hasHorizontalOverflow() const { return scrollWidth() != roundToInt(clientWidth()); }
+ bool hasVerticalOverflow() const { return scrollHeight() != roundToInt(clientHeight()); }
+
+ bool hasScrollableOverflowX() const { return scrollsOverflowX() && hasHorizontalOverflow(); }
+ bool hasScrollableOverflowY() const { return scrollsOverflowY() && hasVerticalOverflow(); }
+
</ins><span class="cx"> bool usesCompositedScrolling() const;
</span><span class="cx">
</span><span class="cx"> bool hasUnsplittableScrollingOverflow() const;
</span></span></pre>
</div>
</div>
</body>
</html>