<!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>[186344] releases/WebKitGTK/webkit-2.8</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/186344">186344</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-06 05:20:47 -0700 (Mon, 06 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/185019">r185019</a> - Text disappears shortly after page load on Nexus 7 site.
https://bugs.webkit.org/show_bug.cgi?id=145467
rdar://problem/18327239
Reviewed by Simon Fraser.
This patch ensures that overlap testing for composited layers works properly when the sibling
layer gets composited through its child.
When a layer gets composited through its child content, the recursive overlap testing should build up the
overlapmap stack so that sibling content is intersected both against the child and its parent bounds.
Source/WebCore:
Tests: compositing/sibling-layer-does-not-get-composited-overflow-hidden-case.html
compositing/sibling-layer-does-not-get-composited-transform-case.html
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::addToOverlapMapRecursive):
(WebCore::RenderLayerCompositor::OverlapMap::contains): Deleted.
LayoutTests:
* compositing/sibling-layer-does-not-get-composited-overflow-hidden-case-expected.html: Added.
* compositing/sibling-layer-does-not-get-composited-overflow-hidden-case.html: Added.
* compositing/sibling-layer-does-not-get-composited-transform-case-expected.html: Added.
* compositing/sibling-layer-does-not-get-composited-transform-case.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorerenderingRenderLayerCompositorcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestscompositingsiblinglayerdoesnotgetcompositedoverflowhiddencaseexpectedhtml">releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/sibling-layer-does-not-get-composited-overflow-hidden-case-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestscompositingsiblinglayerdoesnotgetcompositedoverflowhiddencasehtml">releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/sibling-layer-does-not-get-composited-overflow-hidden-case.html</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestscompositingsiblinglayerdoesnotgetcompositedtransformcaseexpectedhtml">releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/sibling-layer-does-not-get-composited-transform-case-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestscompositingsiblinglayerdoesnotgetcompositedtransformcasehtml">releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/sibling-layer-does-not-get-composited-transform-case.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog (186343 => 186344)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-07-06 12:17:36 UTC (rev 186343)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-07-06 12:20:47 UTC (rev 186344)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-05-29 Zalan Bujtas <zalan@apple.com>
+
+ Text disappears shortly after page load on Nexus 7 site.
+ https://bugs.webkit.org/show_bug.cgi?id=145467
+ rdar://problem/18327239
+
+ Reviewed by Simon Fraser.
+
+ This patch ensures that overlap testing for composited layers works properly when the sibling
+ layer gets composited through its child.
+
+ When a layer gets composited through its child content, the recursive overlap testing should build up the
+ overlapmap stack so that sibling content is intersected both against the child and its parent bounds.
+
+ * compositing/sibling-layer-does-not-get-composited-overflow-hidden-case-expected.html: Added.
+ * compositing/sibling-layer-does-not-get-composited-overflow-hidden-case.html: Added.
+ * compositing/sibling-layer-does-not-get-composited-transform-case-expected.html: Added.
+ * compositing/sibling-layer-does-not-get-composited-transform-case.html: Added.
+
</ins><span class="cx"> 2015-06-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> WebContent crash in WebCore::Page::sessionID() const + 0 (Page.cpp:1660)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestscompositingsiblinglayerdoesnotgetcompositedoverflowhiddencaseexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/sibling-layer-does-not-get-composited-overflow-hidden-case-expected.html (0 => 186344)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/sibling-layer-does-not-get-composited-overflow-hidden-case-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/sibling-layer-does-not-get-composited-overflow-hidden-case-expected.html 2015-07-06 12:20:47 UTC (rev 186344)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that that sibling container gets composited when composition of the inner content is forced by its child container.</title>
+<style>
+ .container {
+ transform: translateZ(0);
+ height: 200px;
+ width: 200px;
+ }
+
+ .inner {
+ transform: translateZ(0);
+ position: absolute;
+ width: 200px;
+ height: 200px;
+ background-color: silver;
+ }
+
+ .inner-most {
+ transform: translateZ(0);
+ display: inline-block;
+ width: 100px;
+ height: 100px;
+ border: 1px solid green;
+ margin-top: 60px;
+ }
+
+ .sibling {
+ transform: translateZ(0);
+ position: relative;
+ width: 200px;
+ height: 40px;
+ background-color: green;
+ }
+</style>
+<body>
+<div class=container>
+ <div class=inner>
+ <div class=inner-most>composited</div>
+ </div>
+ <div class=sibling></div>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestscompositingsiblinglayerdoesnotgetcompositedoverflowhiddencasehtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/sibling-layer-does-not-get-composited-overflow-hidden-case.html (0 => 186344)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/sibling-layer-does-not-get-composited-overflow-hidden-case.html (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/sibling-layer-does-not-get-composited-overflow-hidden-case.html 2015-07-06 12:20:47 UTC (rev 186344)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that that sibling container gets composited when composition of the inner content is forced by its child container.</title>
+<style>
+ .container {
+ transform: translateZ(0);
+ height: 200px;
+ width: 200px;
+ }
+
+ .inner {
+ z-index: 1;
+ overflow: hidden;
+ position: absolute;
+ width: 200px;
+ height: 200px;
+ background-color: silver;
+ }
+
+ .inner-most {
+ transform: translateZ(0);
+ display: inline-block;
+ width: 100px;
+ height: 100px;
+ border: 1px solid green;
+ margin-top: 60px;
+ }
+
+ .sibling {
+ z-index: 1;
+ position: relative;
+ width: 200px;
+ height: 40px;
+ background-color: green;
+ }
+</style>
+<body>
+<div class=container>
+ <div class=inner>
+ <div class=inner-most>composited</div>
+ </div>
+ <div class=sibling></div>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestscompositingsiblinglayerdoesnotgetcompositedtransformcaseexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/sibling-layer-does-not-get-composited-transform-case-expected.html (0 => 186344)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/sibling-layer-does-not-get-composited-transform-case-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/sibling-layer-does-not-get-composited-transform-case-expected.html 2015-07-06 12:20:47 UTC (rev 186344)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that that sibling container gets composited when composition of the inner content is forced by its child container.</title>
+<style>
+ .container {
+ transform: translateZ(0);
+ height: 200px;
+ width: 200px;
+ }
+
+ .inner {
+ transform: translateZ(0);
+ position: absolute;
+ width: 200px;
+ height: 200px;
+ background-color: silver;
+ }
+
+ .inner-most {
+ transform: translateZ(0);
+ display: inline-block;
+ width: 100px;
+ height: 100px;
+ border: 1px solid green;
+ margin-top: 60px;
+ }
+
+ .sibling {
+ transform: translateZ(0);
+ position: relative;
+ width: 200px;
+ height: 40px;
+ background-color: green;
+ }
+</style>
+<body>
+<div class=container>
+ <div class=inner>
+ <div class=inner-most>composited</div>
+ </div>
+ <div class=sibling></div>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestscompositingsiblinglayerdoesnotgetcompositedtransformcasehtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/sibling-layer-does-not-get-composited-transform-case.html (0 => 186344)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/sibling-layer-does-not-get-composited-transform-case.html (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/sibling-layer-does-not-get-composited-transform-case.html 2015-07-06 12:20:47 UTC (rev 186344)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+<html>
+<head>
+<title>This tests that that sibling container gets composited when composition of the inner content is forced by its child container.</title>
+<style>
+ .container {
+ transform: translateZ(0);
+ height: 200px;
+ width: 200px;
+ }
+
+ .inner {
+ transform: translateX(0);
+ background-color: silver;
+ height: 200px;
+ width: 200px;
+ }
+
+ .inner-most {
+ transform: translateZ(0);
+ display: inline-block;
+ width: 100px;
+ height: 100px;
+ border: 1px solid green;
+ margin-top: 60px;
+ }
+
+ .sibling {
+ position: relative;
+ top: -200px;
+ width: 200px;
+ height: 40px;
+ background-color: green;
+ }
+
+</style>
+<body>
+
+<div class=container>
+ <div class=inner>
+ <div class=inner-most>composited</div>
+ </div>
+ <div class=sibling></div>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (186343 => 186344)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-07-06 12:17:36 UTC (rev 186343)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-07-06 12:20:47 UTC (rev 186344)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-05-29 Zalan Bujtas <zalan@apple.com>
+
+ Text disappears shortly after page load on Nexus 7 site.
+ https://bugs.webkit.org/show_bug.cgi?id=145467
+ rdar://problem/18327239
+
+ Reviewed by Simon Fraser.
+
+ This patch ensures that overlap testing for composited layers works properly when the sibling
+ layer gets composited through its child.
+
+ When a layer gets composited through its child content, the recursive overlap testing should build up the
+ overlapmap stack so that sibling content is intersected both against the child and its parent bounds.
+
+ Tests: compositing/sibling-layer-does-not-get-composited-overflow-hidden-case.html
+ compositing/sibling-layer-does-not-get-composited-transform-case.html
+
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::addToOverlapMapRecursive):
+ (WebCore::RenderLayerCompositor::OverlapMap::contains): Deleted.
+
</ins><span class="cx"> 2015-05-29 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Review feedback followup for r185003.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderLayerCompositor.cpp (186343 => 186344)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-07-06 12:17:36 UTC (rev 186343)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-07-06 12:20:47 UTC (rev 186344)
</span><span class="lines">@@ -144,29 +144,24 @@
</span><span class="cx"> pushCompositingContainer();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void add(const RenderLayer* layer, const LayoutRect& bounds)
</del><ins>+ void add(const LayoutRect& bounds)
</ins><span class="cx"> {
</span><span class="cx"> // Layers do not contribute to overlap immediately--instead, they will
</span><span class="cx"> // contribute to overlap as soon as their composited ancestor has been
</span><span class="cx"> // recursively processed and popped off the stack.
</span><span class="cx"> ASSERT(m_overlapStack.size() >= 2);
</span><span class="cx"> m_overlapStack[m_overlapStack.size() - 2].add(bounds);
</span><del>- m_layers.add(layer);
</del><ins>+ m_isEmpty = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- bool contains(const RenderLayer* layer)
- {
- return m_layers.contains(layer);
- }
-
</del><span class="cx"> bool overlapsLayers(const LayoutRect& bounds) const
</span><span class="cx"> {
</span><span class="cx"> return m_overlapStack.last().overlapsLayers(bounds);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool isEmpty()
</del><ins>+ bool isEmpty() const
</ins><span class="cx"> {
</span><del>- return m_layers.isEmpty();
</del><ins>+ return m_isEmpty;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void pushCompositingContainer()
</span><span class="lines">@@ -213,8 +208,8 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> Vector<OverlapMapContainer> m_overlapStack;
</span><del>- HashSet<const RenderLayer*> m_layers;
</del><span class="cx"> RenderGeometryMap m_geometryMap;
</span><ins>+ bool m_isEmpty { true };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct CompositingState {
</span><span class="lines">@@ -1131,12 +1126,12 @@
</span><span class="cx"> clipRect.scale(pageScaleFactor());
</span><span class="cx"> #endif
</span><span class="cx"> clipRect.intersect(layerBounds);
</span><del>- overlapMap.add(&layer, clipRect);
</del><ins>+ overlapMap.add(clipRect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayerCompositor::addToOverlapMapRecursive(OverlapMap& overlapMap, RenderLayer& layer, RenderLayer* ancestorLayer)
</span><span class="cx"> {
</span><del>- if (!canBeComposited(layer) || overlapMap.contains(&layer))
</del><ins>+ if (!canBeComposited(layer))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // A null ancestorLayer is an indication that 'layer' has already been pushed.
</span></span></pre>
</div>
</div>
</body>
</html>