<!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>[182307] 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/182307">182307</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-04-02 23:37:15 -0700 (Thu, 02 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Scrollbars are left in the wrong position when resizing a fixed layout view
https://bugs.webkit.org/show_bug.cgi?id=143360
Reviewed by Beth Dakin.
Test: fast/fixed-layout/fixed-layout.html
* platform/ScrollView.cpp:
(WebCore::ScrollView::setFrameRect):
Update scrollbars when the ScrollView frameRect changes. We were previously
depending on the layout that always happens after this to update scrollbars,
but with fixed layout mode, there won't be a layout! Also, FrameView's
setFrameRect override will sync this scrollbar update with the scrollbar
layers (via RenderLayerCompositor::frameViewDidChangeSize) immediately afterwards.
* testing/Internals.cpp:
(WebCore::Internals::resetToConsistentState):
Turn off fixed layout when resetting state.
(WebCore::Internals::setUseFixedLayout):
(WebCore::Internals::setFixedLayoutSize):
* testing/Internals.h:
* testing/Internals.idl:
Add internals functions to set the fixed layout size and to turn on fixed layout.
* fast/fixed-layout/fixed-layout-expected.png: Added.
* fast/fixed-layout/fixed-layout-expected.txt: Added.
* fast/fixed-layout/fixed-layout.html: Added.
Add a simple fixed layout test. We can add more (or recover some from
when the Qt tests were purged) now that it's testable again.
This test also happens to test the aforementioned setFrameRect change,
because without it, the RenderView's layer would be left at the wrong
size (800x600) because the scrollbars would be left behind in the resize.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollViewcpp">trunk/Source/WebCore/platform/ScrollView.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/fast/fixed-layout/</li>
<li><a href="#trunkLayoutTestsfastfixedlayoutfixedlayoutexpectedpng">trunk/LayoutTests/fast/fixed-layout/fixed-layout-expected.png</a></li>
<li><a href="#trunkLayoutTestsfastfixedlayoutfixedlayoutexpectedtxt">trunk/LayoutTests/fast/fixed-layout/fixed-layout-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastfixedlayoutfixedlayouthtml">trunk/LayoutTests/fast/fixed-layout/fixed-layout.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (182306 => 182307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-03 06:36:09 UTC (rev 182306)
+++ trunk/LayoutTests/ChangeLog 2015-04-03 06:37:15 UTC (rev 182307)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-04-02 Timothy Horton <timothy_horton@apple.com>
+
+ Scrollbars are left in the wrong position when resizing a fixed layout view
+ https://bugs.webkit.org/show_bug.cgi?id=143360
+
+ Reviewed by Beth Dakin.
+
+ * fast/fixed-layout/fixed-layout-expected.png: Added.
+ * fast/fixed-layout/fixed-layout-expected.txt: Added.
+ * fast/fixed-layout/fixed-layout.html: Added.
+ Add a simple fixed layout test. We can add more (or recover some from
+ when the Qt tests were purged) now that it's testable again.
+
+ This test also happens to test the aforementioned setFrameRect change,
+ because without it, the RenderView's layer would be left at the wrong
+ size (800x600) because the scrollbars would be left behind in the resize.
+
</ins><span class="cx"> 2015-04-02 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> New ruby tests are failing on all non-Mac platforms.
</span></span></pre></div>
<a id="trunkLayoutTestsfastfixedlayoutfixedlayoutexpectedpng"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/fast/fixed-layout/fixed-layout-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/fast/fixed-layout/fixed-layout-expected.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestsfastfixedlayoutfixedlayoutexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/fixed-layout/fixed-layout-expected.txt (0 => 182307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/fixed-layout/fixed-layout-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/fixed-layout/fixed-layout-expected.txt 2015-04-03 06:37:15 UTC (rev 182307)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+layer at (0,0) size 400x400
+ RenderView at (0,0) size 400x400
+layer at (0,0) size 400x400
+ RenderBlock {HTML} at (0,0) size 400x400
+ RenderBody {BODY} at (0,0) size 400x400
+layer at (0,0) size 400x400
+ RenderBlock (positioned) {DIV} at (0,0) size 400x400 [bgcolor=#008000]
+layer at (0,0) size 100x100
+ RenderBlock (positioned) {DIV} at (0,0) size 100x100 [bgcolor=#0000FF]
</ins></span></pre></div>
<a id="trunkLayoutTestsfastfixedlayoutfixedlayouthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/fixed-layout/fixed-layout.html (0 => 182307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/fixed-layout/fixed-layout.html (rev 0)
+++ trunk/LayoutTests/fast/fixed-layout/fixed-layout.html 2015-04-03 06:37:15 UTC (rev 182307)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<head>
+<script>
+window.onload = function () {
+ if (!window.testRunner) {
+ document.write("Test cannot be run manually.");
+ return;
+ }
+
+ testRunner.waitUntilDone();
+
+ window.resizeTo(200, 200);
+
+ internals.setUseFixedLayout(true);
+ internals.setFixedLayoutSize(400, 400);
+
+ setTimeout(function () {
+ testRunner.notifyDone();
+ }, 0);
+}
+</script>
+</head>
+<body style="margin: 0;">
+<div style="width: 100%; height: 100%; position: absolute; background-color: green;"></div>
+<div style="width: 50vw; height: 50vh; position: absolute; background-color: blue;"></div>
+</body>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182306 => 182307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-03 06:36:09 UTC (rev 182306)
+++ trunk/Source/WebCore/ChangeLog 2015-04-03 06:37:15 UTC (rev 182307)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-04-02 Timothy Horton <timothy_horton@apple.com>
+
+ Scrollbars are left in the wrong position when resizing a fixed layout view
+ https://bugs.webkit.org/show_bug.cgi?id=143360
+
+ Reviewed by Beth Dakin.
+
+ Test: fast/fixed-layout/fixed-layout.html
+
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::setFrameRect):
+ Update scrollbars when the ScrollView frameRect changes. We were previously
+ depending on the layout that always happens after this to update scrollbars,
+ but with fixed layout mode, there won't be a layout! Also, FrameView's
+ setFrameRect override will sync this scrollbar update with the scrollbar
+ layers (via RenderLayerCompositor::frameViewDidChangeSize) immediately afterwards.
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::resetToConsistentState):
+ Turn off fixed layout when resetting state.
+
+ (WebCore::Internals::setUseFixedLayout):
+ (WebCore::Internals::setFixedLayoutSize):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+ Add internals functions to set the fixed layout size and to turn on fixed layout.
+
</ins><span class="cx"> 2015-04-02 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed: Reapplied Change after rollout.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.cpp (182306 => 182307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.cpp 2015-04-03 06:36:09 UTC (rev 182306)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2015-04-03 06:37:15 UTC (rev 182307)
</span><span class="lines">@@ -1053,6 +1053,8 @@
</span><span class="cx">
</span><span class="cx"> Widget::setFrameRect(newRect);
</span><span class="cx"> frameRectsChanged();
</span><ins>+
+ updateScrollbars(scrollOffset());
</ins><span class="cx">
</span><span class="cx"> if (!m_useFixedLayout && oldRect.size() != newRect.size())
</span><span class="cx"> availableContentSizeChanged(AvailableSizeChangeReason::AreaSizeChanged);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (182306 => 182307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-04-03 06:36:09 UTC (rev 182306)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-04-03 06:37:15 UTC (rev 182307)
</span><span class="lines">@@ -294,6 +294,8 @@
</span><span class="cx"> mainFrameView->setHeaderHeight(0);
</span><span class="cx"> mainFrameView->setFooterHeight(0);
</span><span class="cx"> page->setTopContentInset(0);
</span><ins>+ mainFrameView->setUseFixedLayout(false);
+ mainFrameView->setFixedLayoutSize(IntSize());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TextRun::setAllowsRoundingHacks(false);
</span><span class="lines">@@ -1918,6 +1920,28 @@
</span><span class="cx"> frame->setPageZoomFactor(zoomFactor);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Internals::setUseFixedLayout(bool useFixedLayout, ExceptionCode& ec)
+{
+ Document* document = contextDocument();
+ if (!document || !document->view()) {
+ ec = INVALID_ACCESS_ERR;
+ return;
+ }
+ FrameView* frameView = document->view();
+ frameView->setUseFixedLayout(useFixedLayout);
+}
+
+void Internals::setFixedLayoutSize(int width, int height, ExceptionCode& ec)
+{
+ Document* document = contextDocument();
+ if (!document || !document->view()) {
+ ec = INVALID_ACCESS_ERR;
+ return;
+ }
+ FrameView* frameView = document->view();
+ frameView->setFixedLayoutSize(IntSize(width, height));
+}
+
</ins><span class="cx"> void Internals::setHeaderHeight(float height)
</span><span class="cx"> {
</span><span class="cx"> Document* document = contextDocument();
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (182306 => 182307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2015-04-03 06:36:09 UTC (rev 182306)
+++ trunk/Source/WebCore/testing/Internals.h 2015-04-03 06:37:15 UTC (rev 182307)
</span><span class="lines">@@ -267,6 +267,9 @@
</span><span class="cx"> void setPageScaleFactor(float scaleFactor, int x, int y, ExceptionCode&);
</span><span class="cx"> void setPageZoomFactor(float zoomFactor, ExceptionCode&);
</span><span class="cx">
</span><ins>+ void setUseFixedLayout(bool useFixedLayout, ExceptionCode&);
+ void setFixedLayoutSize(int width, int height, ExceptionCode&);
+
</ins><span class="cx"> void setHeaderHeight(float);
</span><span class="cx"> void setFooterHeight(float);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (182306 => 182307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2015-04-03 06:36:09 UTC (rev 182306)
+++ trunk/Source/WebCore/testing/Internals.idl 2015-04-03 06:37:15 UTC (rev 182307)
</span><span class="lines">@@ -241,6 +241,9 @@
</span><span class="cx"> [RaisesException] void setPageScaleFactor(unrestricted float scaleFactor, long x, long y);
</span><span class="cx"> [RaisesException] void setPageZoomFactor(unrestricted float zoomFactor);
</span><span class="cx">
</span><ins>+ [RaisesException] void setUseFixedLayout(boolean useFixedLayout);
+ [RaisesException] void setFixedLayoutSize(long width, long height);
+
</ins><span class="cx"> void setHeaderHeight(unrestricted float height);
</span><span class="cx"> void setFooterHeight(unrestricted float height);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>