<!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>[218540] releases/WebKitGTK/webkit-2.16</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/218540">218540</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-06-19 23:35:22 -0700 (Mon, 19 Jun 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/217472">r217472</a> - Frame's composited content is visible when the frame has visibility: hidden.
https://bugs.webkit.org/show_bug.cgi?id=125565
<rdar://problem/32196849>

Reviewed by Simon Fraser.

Source/WebCore:

Do not construct composited layers for hidden RenderWidgets (frameset, iframe, object).
Note that we still construct layers for the associated renderers as usual.

Tests: compositing/visibility/frameset-visibility-hidden.html
       compositing/visibility/iframe-visibility-hidden.html
       compositing/visibility/object-visibility-hidden.html

* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::requiresCompositingForPlugin):
(WebCore::RenderLayerCompositor::requiresCompositingForFrame):

LayoutTests:

* compositing/resources/visibility.html: Added.
* compositing/visibility/frameset-visibility-hidden-expected.html: Added.
* compositing/visibility/frameset-visibility-hidden.html: Added.
* compositing/visibility/iframe-visibility-hidden-expected.html: Added.
* compositing/visibility/iframe-visibility-hidden.html: Added.
* compositing/visibility/object-visibility-hidden-expected.html: Added.
* compositing/visibility/object-visibility-hidden.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCorerenderingRenderLayerCompositorcpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestscompositingresourcesvisibilityhtml">releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/resources/visibility.html</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestscompositingvisibilityframesetvisibilityhiddenexpectedhtml">releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/visibility/frameset-visibility-hidden-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestscompositingvisibilityframesetvisibilityhiddenhtml">releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/visibility/frameset-visibility-hidden.html</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestscompositingvisibilityiframevisibilityhiddenexpectedhtml">releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/visibility/iframe-visibility-hidden-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestscompositingvisibilityiframevisibilityhiddenhtml">releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/visibility/iframe-visibility-hidden.html</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestscompositingvisibilityobjectvisibilityhiddenexpectedhtml">releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/visibility/object-visibility-hidden-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestscompositingvisibilityobjectvisibilityhiddenhtml">releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/visibility/object-visibility-hidden.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit216LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog (218539 => 218540)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog     2017-06-20 06:31:06 UTC (rev 218539)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog        2017-06-20 06:35:22 UTC (rev 218540)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-05-25  Zalan Bujtas  <zalan@apple.com>
+
+        Frame's composited content is visible when the frame has visibility: hidden.
+        https://bugs.webkit.org/show_bug.cgi?id=125565
+        <rdar://problem/32196849>
+
+        Reviewed by Simon Fraser.
+
+        * compositing/resources/visibility.html: Added.
+        * compositing/visibility/frameset-visibility-hidden-expected.html: Added.
+        * compositing/visibility/frameset-visibility-hidden.html: Added.
+        * compositing/visibility/iframe-visibility-hidden-expected.html: Added.
+        * compositing/visibility/iframe-visibility-hidden.html: Added.
+        * compositing/visibility/object-visibility-hidden-expected.html: Added.
+        * compositing/visibility/object-visibility-hidden.html: Added.
+
</ins><span class="cx"> 2017-05-25  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         DocumentThreadableLoader::redirectReceived() should not rely on the resource's loader
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestscompositingresourcesvisibilityhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/resources/visibility.html (0 => 218540)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/resources/visibility.html                         (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/resources/visibility.html    2017-06-20 06:35:22 UTC (rev 218540)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests visibility with frames and objects.</title>
+<style>
+div {
+    will-change: transform;
+    width: 50px;
+    height: 50px;
+    background-color: green;
+}
+</style>
+</head>
+<body>
+<div></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestscompositingvisibilityframesetvisibilityhiddenexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/visibility/frameset-visibility-hidden-expected.html (0 => 218540)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/visibility/frameset-visibility-hidden-expected.html                               (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/visibility/frameset-visibility-hidden-expected.html  2017-06-20 06:35:22 UTC (rev 218540)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests frames with visibility hidden</title>
+<style>
+div {
+       will-change: transform;
+       width: 50px;
+       height: 50px;
+       background-color: green;
+}
+</style>
+</head>
+<body>
+<div></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestscompositingvisibilityframesetvisibilityhiddenhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/visibility/frameset-visibility-hidden.html (0 => 218540)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/visibility/frameset-visibility-hidden.html                                (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/visibility/frameset-visibility-hidden.html   2017-06-20 06:35:22 UTC (rev 218540)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<frameset cols="100, 100, 100, *">
+  <frame noresize frameborder=no src="data:text/html,<div style='will-change: transform; width: 50px; height: 50px; background-color: green;'><div style='visibility: visible;'></div>">
+  <frame noresize frameborder=no style="visibility: hidden" src="data:text/html,<div style='will-change: transform; width: 50px; height: 50px; background-color: red;'><div style='visibility: visible;'></div>">
+  <frame noresize frameborder=no style="visibility: hidden" src="data:text/html,<div style='will-change: transform; width: 50px; height: 50px; background-color: red;'><div style='visibility: hidden;'></div>">
+  <frame noresize frameborder=no style="visibility: collapse" src="data:text/html,<div style='will-change: transform; width: 50px; height: 50px; background-color: red;'><div style='visibility: visible;'></div>">
+</frameset>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestscompositingvisibilityiframevisibilityhiddenexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/visibility/iframe-visibility-hidden-expected.html (0 => 218540)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/visibility/iframe-visibility-hidden-expected.html                         (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/visibility/iframe-visibility-hidden-expected.html    2017-06-20 06:35:22 UTC (rev 218540)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests iframe with visibility hidden</title>
+<style>
+div {
+    margin: 8px;
+    margin-right: 26px;
+    width: 50px;
+    height: 50px;
+    background-color: green;
+    display: inline-block;
+}
+
+.positioned {
+    position: absolute;
+    left: 80px;
+    top: 8px;
+}
+</style>
+</head>
+<body>
+<div></div><div class=positioned></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestscompositingvisibilityiframevisibilityhiddenhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/visibility/iframe-visibility-hidden.html (0 => 218540)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/visibility/iframe-visibility-hidden.html                          (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/visibility/iframe-visibility-hidden.html     2017-06-20 06:35:22 UTC (rev 218540)
</span><span class="lines">@@ -0,0 +1,61 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests iframe with visibility hidden</title>
+<script>
+if (window.testRunner)
+    testRunner.waitUntilDone();
+
+var iframe1IsVisible = false;
+var iframe2IsVisible = false;
+
+function makeiframe1Visible()
+{
+    document.getElementById("iframe1").style.visibility = "visible";
+    iframe1IsVisible = true;
+    elementIsVisibleNow();
+}
+
+function makeiframe2Visible()
+{
+    document.getElementById("iframe2").style.visibility = "visible";
+    iframe2IsVisible = true;
+    elementIsVisibleNow();
+}
+
+function elementIsVisibleNow()
+{
+    if (!iframe1IsVisible || !iframe2IsVisible)
+        return;
+    document.body.offsetHeight;
+    if (window.testRunner)
+        testRunner.notifyDone();
+}
+</script>
+<style>
+#iframe2 {
+    position: absolute;
+    left: 80px;
+    top: 8px;
+}
+</style>
+</head>
+<body>
+<iframe frameborder=no id=iframe1 onload="makeiframe1Visible()" width="80" height="80" style="visibility: hidden"
+    srcdoc="<div style='will-change: transform; width: 50px; height: 50px; background-color: green;'>
+          <div style='visibility: visible;'></div>
+        </div>">
+</iframe>
+<iframe frameborder=no id=iframe2 onload="makeiframe2Visible()" width="80" height="80" style="visibility: hidden"
+    srcdoc="
+        <video style='width: 50px; height: 50px; background-color: green;'>
+            <source src='movie.mp4' type='video/mp4'>
+        </video>">
+</iframe>
+<iframe frameborder=no width="80" height="80" style="visibility: hidden"
+    srcdoc="<div style='will-change: transform; width: 50px; height: 50px; background-color: red;'>
+          <div style='visibility: visible;'></div>
+        </div>">
+</iframe>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestscompositingvisibilityobjectvisibilityhiddenexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/visibility/object-visibility-hidden-expected.html (0 => 218540)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/visibility/object-visibility-hidden-expected.html                         (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/visibility/object-visibility-hidden-expected.html    2017-06-20 06:35:22 UTC (rev 218540)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests object with visibility hidden</title>
+<style>
+div {
+       will-change: transform;
+       width: 50px;
+       height: 50px;
+       margin: 16px 0px 0px 8px;
+       background-color: green;
+}
+</style>
+</head>
+<body>
+<div></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestscompositingvisibilityobjectvisibilityhiddenhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/visibility/object-visibility-hidden.html (0 => 218540)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/visibility/object-visibility-hidden.html                          (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/visibility/object-visibility-hidden.html     2017-06-20 06:35:22 UTC (rev 218540)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests object with visibility hidden</title>
+</head>
+<body>
+<object style="visibility: visible" data="../resources/visibility.html" type="text/html" width="80" height="80"></object>
+<object style="visibility: collapse" data="../resources/visibility.html" type="text/html" width="80" height="80"></object>
+<object style="visibility: hidden" data="../resources/visibility.html" type="text/html" width="80" height="80"></object>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (218539 => 218540)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog  2017-06-20 06:31:06 UTC (rev 218539)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog     2017-06-20 06:35:22 UTC (rev 218540)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-05-25  Zalan Bujtas  <zalan@apple.com>
+
+        Frame's composited content is visible when the frame has visibility: hidden.
+        https://bugs.webkit.org/show_bug.cgi?id=125565
+        <rdar://problem/32196849>
+
+        Reviewed by Simon Fraser.
+
+        Do not construct composited layers for hidden RenderWidgets (frameset, iframe, object).
+        Note that we still construct layers for the associated renderers as usual. 
+
+        Tests: compositing/visibility/frameset-visibility-hidden.html
+               compositing/visibility/iframe-visibility-hidden.html
+               compositing/visibility/object-visibility-hidden.html
+
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::requiresCompositingForPlugin):
+        (WebCore::RenderLayerCompositor::requiresCompositingForFrame):
+
</ins><span class="cx"> 2017-05-25  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         DocumentThreadableLoader::redirectReceived() should not rely on the resource's loader
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerCompositor.cpp (218539 => 218540)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerCompositor.cpp        2017-06-20 06:31:06 UTC (rev 218539)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayerCompositor.cpp   2017-06-20 06:35:22 UTC (rev 218540)
</span><span class="lines">@@ -2536,6 +2536,9 @@
</span><span class="cx">     m_reevaluateCompositingAfterLayout = true;
</span><span class="cx">     
</span><span class="cx">     RenderWidget& pluginRenderer = downcast<RenderWidget>(renderer);
</span><ins>+    if (pluginRenderer.style().visibility() != VISIBLE)
+        return false;
+
</ins><span class="cx">     // If we can't reliably know the size of the plugin yet, don't change compositing state.
</span><span class="cx">     if (pluginRenderer.needsLayout())
</span><span class="cx">         return pluginRenderer.isComposited();
</span><span class="lines">@@ -2551,6 +2554,9 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     auto& frameRenderer = downcast<RenderWidget>(renderer);
</span><ins>+    if (frameRenderer.style().visibility() != VISIBLE)
+        return false;
+
</ins><span class="cx">     if (!frameRenderer.requiresAcceleratedCompositing())
</span><span class="cx">         return false;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>