<!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>[203644] 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/203644">203644</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-23 08:25:42 -0700 (Sat, 23 Jul 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Coordinated Graphics] Lots of flaky tests
https://bugs.webkit.org/show_bug.cgi?id=160118

Patch by Carlos Garcia Campos &lt;cgarcia@igalia.com&gt; on 2016-07-23
Reviewed by Michael Catanzaro.

Source/WebCore:

Since the GTK+ ported to threaded compositor (coordinated graphics) there are a lot of flaky tests in the
bots. In manu of the cases the diff shows a different size in the FrameView layer.

This happens for tests run in the same WTR after fast/fixed-layout/fixed-layout.html. This is what happens:

 1.- Test fast/fixed-layout/fixed-layout.html runs and sets fixed layout to true and fixed layout size to 400x400
 2.- When it finishes TestController::resetStateToConsistentValues() is called.
 3.- Blank URL is loaded after state has been updated
 4.- Then Reset message is handled in the web process and Internals::resetToConsistentState() resets the fixed
     layout state and size.
 5.- onresize happens and the handler set in fast/fixed-layout/fixed-layout.html is invoked setting the fixed
     layout to true and size to 400x400 again.
 6.- about_blank is then loaded with the fixed layout enabled, as well as other tests after this one.

In addition to this, coordinated graphics uses a fixedVisibleContentRect in ScrollView that is never reset.

* platform/ScrollView.cpp:
(WebCore::ScrollView::unscaledVisibleContentSizeIncludingObscuredArea): Only use m_fixedVisibleContentRect when
fixed layout is enabled.
(WebCore::ScrollView::unscaledUnobscuredVisibleContentSize): Ditto.
(WebCore::ScrollView::visibleContentRectInternal): Ditto.
* testing/Internals.cpp:
(WebCore::Internals::resetToConsistentState): Reset also the m_fixedVisibleContentRect.

LayoutTests:

* fast/fixed-layout/fixed-layout.html: Remove the onresize handler when the test finishes to ensure it can't be
called later affecting other tests.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastfixedlayoutfixedlayouthtml">trunk/LayoutTests/fast/fixed-layout/fixed-layout.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>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (203643 => 203644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-07-23 15:23:53 UTC (rev 203643)
+++ trunk/LayoutTests/ChangeLog        2016-07-23 15:25:42 UTC (rev 203644)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2016-07-23  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
</span><span class="cx"> 
</span><ins>+        [Coordinated Graphics] Lots of flaky tests
+        https://bugs.webkit.org/show_bug.cgi?id=160118
+
+        Reviewed by Michael Catanzaro.
+
+        * fast/fixed-layout/fixed-layout.html: Remove the onresize handler when the test finishes to ensure it can't be
+        called later affecting other tests.
+
+2016-07-23  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
+
</ins><span class="cx">         [Coordinated Graphics] Test imported/blink/svg/custom/svg-image-layers-crash.html crashes
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=160078
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfastfixedlayoutfixedlayouthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/fixed-layout/fixed-layout.html (203643 => 203644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/fixed-layout/fixed-layout.html        2016-07-23 15:23:53 UTC (rev 203643)
+++ trunk/LayoutTests/fast/fixed-layout/fixed-layout.html        2016-07-23 15:25:42 UTC (rev 203644)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx">     internals.setFixedLayoutSize(400, 400);
</span><span class="cx"> 
</span><span class="cx">     testRunner.notifyDone();
</span><ins>+    window.onresize = null;
</ins><span class="cx"> }
</span><span class="cx"> &lt;/script&gt;
</span><span class="cx"> &lt;/head&gt;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203643 => 203644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-07-23 15:23:53 UTC (rev 203643)
+++ trunk/Source/WebCore/ChangeLog        2016-07-23 15:25:42 UTC (rev 203644)
</span><span class="lines">@@ -1,5 +1,36 @@
</span><span class="cx"> 2016-07-23  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
</span><span class="cx"> 
</span><ins>+        [Coordinated Graphics] Lots of flaky tests
+        https://bugs.webkit.org/show_bug.cgi?id=160118
+
+        Reviewed by Michael Catanzaro.
+
+        Since the GTK+ ported to threaded compositor (coordinated graphics) there are a lot of flaky tests in the
+        bots. In manu of the cases the diff shows a different size in the FrameView layer.
+
+        This happens for tests run in the same WTR after fast/fixed-layout/fixed-layout.html. This is what happens:
+
+         1.- Test fast/fixed-layout/fixed-layout.html runs and sets fixed layout to true and fixed layout size to 400x400
+         2.- When it finishes TestController::resetStateToConsistentValues() is called.
+         3.- Blank URL is loaded after state has been updated
+         4.- Then Reset message is handled in the web process and Internals::resetToConsistentState() resets the fixed
+             layout state and size.
+         5.- onresize happens and the handler set in fast/fixed-layout/fixed-layout.html is invoked setting the fixed
+             layout to true and size to 400x400 again.
+         6.- about_blank is then loaded with the fixed layout enabled, as well as other tests after this one.
+
+        In addition to this, coordinated graphics uses a fixedVisibleContentRect in ScrollView that is never reset.
+
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::unscaledVisibleContentSizeIncludingObscuredArea): Only use m_fixedVisibleContentRect when
+        fixed layout is enabled.
+        (WebCore::ScrollView::unscaledUnobscuredVisibleContentSize): Ditto.
+        (WebCore::ScrollView::visibleContentRectInternal): Ditto.
+        * testing/Internals.cpp:
+        (WebCore::Internals::resetToConsistentState): Reset also the m_fixedVisibleContentRect.
+
+2016-07-23  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
+
</ins><span class="cx">         [Coordinated Graphics] Test imported/blink/svg/custom/svg-image-layers-crash.html crashes
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=160078
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.cpp (203643 => 203644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.cpp        2016-07-23 15:23:53 UTC (rev 203643)
+++ trunk/Source/WebCore/platform/ScrollView.cpp        2016-07-23 15:25:42 UTC (rev 203644)
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx">         return platformVisibleContentSizeIncludingObscuredArea(scrollbarInclusion == IncludeScrollbars);
</span><span class="cx"> 
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS)
</span><del>-    if (!m_fixedVisibleContentRect.isEmpty())
</del><ins>+    if (m_useFixedLayout &amp;&amp; !m_fixedVisibleContentRect.isEmpty())
</ins><span class="cx">         return m_fixedVisibleContentRect.size();
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx">         return platformVisibleContentSize(scrollbarInclusion == IncludeScrollbars);
</span><span class="cx"> 
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS)
</span><del>-    if (!m_fixedVisibleContentRect.isEmpty())
</del><ins>+    if (m_useFixedLayout &amp;&amp; !m_fixedVisibleContentRect.isEmpty())
</ins><span class="cx">         return visibleContentSize;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx">         return platformVisibleContentRect(scrollbarInclusion == IncludeScrollbars);
</span><span class="cx"> 
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS)
</span><del>-    if (!m_fixedVisibleContentRect.isEmpty())
</del><ins>+    if (m_useFixedLayout &amp;&amp; !m_fixedVisibleContentRect.isEmpty())
</ins><span class="cx">         return m_fixedVisibleContentRect;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (203643 => 203644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp        2016-07-23 15:23:53 UTC (rev 203643)
+++ trunk/Source/WebCore/testing/Internals.cpp        2016-07-23 15:25:42 UTC (rev 203644)
</span><span class="lines">@@ -375,6 +375,9 @@
</span><span class="cx">         page.setTopContentInset(0);
</span><span class="cx">         mainFrameView-&gt;setUseFixedLayout(false);
</span><span class="cx">         mainFrameView-&gt;setFixedLayoutSize(IntSize());
</span><ins>+#if USE(COORDINATED_GRAPHICS)
+        mainFrameView-&gt;setFixedVisibleContentRect(IntRect());
+#endif
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     WebCore::overrideUserPreferredLanguages(Vector&lt;String&gt;());
</span></span></pre>
</div>
</div>

</body>
</html>