<!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>[162515] 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/162515">162515</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-01-22 05:07:25 -0800 (Wed, 22 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update overlay scrollbars in single pass
https://bugs.webkit.org/show_bug.cgi?id=127289
Source/WebCore:
Reviewed by Anders Carlsson.
* platform/ScrollView.cpp:
(WebCore::ScrollView::updateScrollbars):
Multi-pass scrollbar resolution is only needed for traditional scrollbars. Overlay scrollbars don't affect layout.
LayoutTests:
* platform/mac/accessibility/iframe-aria-hidden.html:
Try to keep this non-flaky by forcing layout. Real fix would probably be in the
accessibility test framework.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityiframeariahiddenhtml">trunk/LayoutTests/platform/mac/accessibility/iframe-aria-hidden.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollViewcpp">trunk/Source/WebCore/platform/ScrollView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (162514 => 162515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-22 11:40:00 UTC (rev 162514)
+++ trunk/LayoutTests/ChangeLog 2014-01-22 13:07:25 UTC (rev 162515)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-01-22 Antti Koivisto <antti@apple.com>
+
+ Update overlay scrollbars in single pass
+ https://bugs.webkit.org/show_bug.cgi?id=127289
+
+ * platform/mac/accessibility/iframe-aria-hidden.html:
+
+ Try to keep this non-flaky by forcing layout. Real fix would probably be in the
+ accessibility test framework.
+
</ins><span class="cx"> 2014-01-22 ChangSeok Oh <changseok.oh@collabora.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed GTK gardening
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityiframeariahiddenhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/iframe-aria-hidden.html (162514 => 162515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/iframe-aria-hidden.html 2014-01-22 11:40:00 UTC (rev 162514)
+++ trunk/LayoutTests/platform/mac/accessibility/iframe-aria-hidden.html 2014-01-22 13:07:25 UTC (rev 162515)
</span><span class="lines">@@ -28,6 +28,10 @@
</span><span class="cx"> shouldBe("body.childAtIndex(0).childrenCount", "0");
</span><span class="cx">
</span><span class="cx"> document.getElementById("iframe").setAttribute("aria-hidden", "false");
</span><ins>+
+ document.getElementById("iframe").contentWindow.document.body.offsetWidth;
+ document.body.offsetWidth;
+
</ins><span class="cx"> shouldBe("body.childrenCount", "4");
</span><span class="cx"> shouldBe("body.childAtIndex(0).childAtIndex(0).childAtIndex(0).role", "'AXRole: AXWebArea'");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162514 => 162515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-22 11:40:00 UTC (rev 162514)
+++ trunk/Source/WebCore/ChangeLog 2014-01-22 13:07:25 UTC (rev 162515)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-22 Antti Koivisto <antti@apple.com>
+
+ Update overlay scrollbars in single pass
+ https://bugs.webkit.org/show_bug.cgi?id=127289
+
+ Reviewed by Anders Carlsson.
+
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::updateScrollbars):
+
+ Multi-pass scrollbar resolution is only needed for traditional scrollbars. Overlay scrollbars don't affect layout.
+
</ins><span class="cx"> 2014-01-22 Mihnea Ovidenie <mihnea@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSSRegions] Incorrect layout of a region pseudo children
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.cpp (162514 => 162515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.cpp 2014-01-22 11:40:00 UTC (rev 162514)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2014-01-22 13:07:25 UTC (rev 162515)
</span><span class="lines">@@ -505,10 +505,12 @@
</span><span class="cx"> if (m_inUpdateScrollbars || prohibitsScrolling() || platformWidget())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ bool hasOverlayScrollbars = (!m_horizontalScrollbar || m_horizontalScrollbar->isOverlayScrollbar()) && (!m_verticalScrollbar || m_verticalScrollbar->isOverlayScrollbar());
+
</ins><span class="cx"> // If we came in here with the view already needing a layout, then go ahead and do that
</span><span class="cx"> // first. (This will be the common case, e.g., when the page changes due to window resizing for example).
</span><span class="cx"> // This layout will not re-enter updateScrollbars and does not count towards our max layout pass total.
</span><del>- if (!m_scrollbarsSuppressed) {
</del><ins>+ if (!m_scrollbarsSuppressed && !hasOverlayScrollbars) {
</ins><span class="cx"> m_inUpdateScrollbars = true;
</span><span class="cx"> visibleContentsResized();
</span><span class="cx"> m_inUpdateScrollbars = false;
</span><span class="lines">@@ -548,30 +550,31 @@
</span><span class="cx"> IntSize docSize = totalContentsSize();
</span><span class="cx"> IntSize fullVisibleSize = visibleContentRect(IncludeScrollbars).size();
</span><span class="cx">
</span><del>- if (hScroll == ScrollbarAuto) {
</del><ins>+ if (hScroll == ScrollbarAuto)
</ins><span class="cx"> newHasHorizontalScrollbar = docSize.width() > visibleWidth();
</span><del>- if (newHasHorizontalScrollbar && !m_updateScrollbarsPass && docSize.width() <= fullVisibleSize.width() && docSize.height() <= fullVisibleSize.height())
- newHasHorizontalScrollbar = false;
- }
- if (vScroll == ScrollbarAuto) {
</del><ins>+ if (vScroll == ScrollbarAuto)
</ins><span class="cx"> newHasVerticalScrollbar = docSize.height() > visibleHeight();
</span><del>- if (newHasVerticalScrollbar && !m_updateScrollbarsPass && docSize.width() <= fullVisibleSize.width() && docSize.height() <= fullVisibleSize.height())
- newHasVerticalScrollbar = false;
- }
</del><span class="cx">
</span><del>- // If we ever turn one scrollbar off, always turn the other one off too. Never ever
- // try to both gain/lose a scrollbar in the same pass.
</del><span class="cx"> bool needAnotherPass = false;
</span><del>- if (!newHasHorizontalScrollbar && hasHorizontalScrollbar && vScroll != ScrollbarAlwaysOn) {
- newHasVerticalScrollbar = false;
- needAnotherPass = true;
</del><ins>+ if (!hasOverlayScrollbars) {
+ // If we ever turn one scrollbar off, always turn the other one off too. Never ever
+ // try to both gain/lose a scrollbar in the same pass.
+ if (!m_updateScrollbarsPass && docSize.width() <= fullVisibleSize.width() && docSize.height() <= fullVisibleSize.height()) {
+ if (hScroll == ScrollbarAuto)
+ newHasHorizontalScrollbar = false;
+ if (vScroll == ScrollbarAuto)
+ newHasVerticalScrollbar = false;
+ }
+ if (!newHasHorizontalScrollbar && hasHorizontalScrollbar && vScroll != ScrollbarAlwaysOn) {
+ newHasVerticalScrollbar = false;
+ needAnotherPass = true;
+ }
+ if (!newHasVerticalScrollbar && hasVerticalScrollbar && hScroll != ScrollbarAlwaysOn) {
+ newHasHorizontalScrollbar = false;
+ needAnotherPass = true;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (!newHasVerticalScrollbar && hasVerticalScrollbar && hScroll != ScrollbarAlwaysOn) {
- newHasHorizontalScrollbar = false;
- needAnotherPass = true;
- }
-
</del><span class="cx"> if (hasHorizontalScrollbar != newHasHorizontalScrollbar && (hasHorizontalScrollbar || !avoidScrollbarCreation())) {
</span><span class="cx"> if (scrollOrigin().y() && !newHasHorizontalScrollbar)
</span><span class="cx"> ScrollableArea::setScrollOrigin(IntPoint(scrollOrigin().x(), scrollOrigin().y() - m_horizontalScrollbar->height()));
</span></span></pre>
</div>
</div>
</body>
</html>