<!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>[149914] 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/149914">149914</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2013-05-10 17:31:59 -0700 (Fri, 10 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Garbage down left side of nytimes.com page (if subscriber)
https://bugs.webkit.org/show_bug.cgi?id=115839

Source/WebCore:

Reviewed by Antti Koivisto.

RenderLayer::backgroundIsKnownToBeOpaqueInRect() would incorrectly return true
for layers where the given rect wasn't contained in the background rect, but
where some child layer obscured the rect, even though clipping hid part
of that child layer.

So bail from RenderLayer::backgroundIsKnownToBeOpaqueInRect() if we have
any overflow clipping. This could be enhanced in future to test whether child
layers obscure the clipping rect, but that would be more expensive.

Test: compositing/contents-opaque/overflow-hidden-child-layers.html

* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::backgroundIsKnownToBeOpaqueInRect):

LayoutTests:

Reviewed by Antti Koivisto.

* compositing/contents-opaque/overflow-hidden-child-layers-expected.txt: Added.
* compositing/contents-opaque/overflow-hidden-child-layers.html: Added.</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="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscompositingcontentsopaqueoverflowhiddenchildlayersexpectedtxt">trunk/LayoutTests/compositing/contents-opaque/overflow-hidden-child-layers-expected.txt</a></li>
<li><a href="#trunkLayoutTestscompositingcontentsopaqueoverflowhiddenchildlayershtml">trunk/LayoutTests/compositing/contents-opaque/overflow-hidden-child-layers.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (149913 => 149914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2013-05-10 23:42:07 UTC (rev 149913)
+++ trunk/LayoutTests/ChangeLog        2013-05-11 00:31:59 UTC (rev 149914)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-05-10  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
+        Garbage down left side of nytimes.com page (if subscriber)
+        https://bugs.webkit.org/show_bug.cgi?id=115839
+
+        Reviewed by Antti Koivisto.
+
+        * compositing/contents-opaque/overflow-hidden-child-layers-expected.txt: Added.
+        * compositing/contents-opaque/overflow-hidden-child-layers.html: Added.
+
</ins><span class="cx"> 2013-05-10  Eric Carlson  &lt;eric.carlson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         In-band captions not visible immediately after track mode change
</span></span></pre></div>
<a id="trunkLayoutTestscompositingcontentsopaqueoverflowhiddenchildlayersexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/contents-opaque/overflow-hidden-child-layers-expected.txt (0 => 149914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/contents-opaque/overflow-hidden-child-layers-expected.txt                                (rev 0)
+++ trunk/LayoutTests/compositing/contents-opaque/overflow-hidden-child-layers-expected.txt        2013-05-11 00:31:59 UTC (rev 149914)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+(GraphicsLayer
+  (bounds 800.00 600.00)
+  (children 1
+    (GraphicsLayer
+      (bounds 800.00 600.00)
+      (contentsOpaque 1)
+      (children 1
+        (GraphicsLayer
+          (position 30.00 22.00)
+          (bounds 156.00 156.00)
+          (drawsContent 1)
+        )
+      )
+    )
+  )
+)
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/compositing/contents-opaque/overflow-hidden-child-layers-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestscompositingcontentsopaqueoverflowhiddenchildlayershtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/contents-opaque/overflow-hidden-child-layers.html (0 => 149914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/contents-opaque/overflow-hidden-child-layers.html                                (rev 0)
+++ trunk/LayoutTests/compositing/contents-opaque/overflow-hidden-child-layers.html        2013-05-11 00:31:59 UTC (rev 149914)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+
+&lt;html&gt;
+&lt;head&gt;
+    &lt;style&gt;
+        .box {
+            height: 100px;
+            width: 100px;
+            margin: 50px;
+            background-color: blue;
+            box-shadow: 0 0 20px black;
+            overflow: hidden;
+            -webkit-transform: translateZ(0);
+        }
+        
+        .child {
+            position: relative;
+            top: -30px;
+            left: -30px;
+            width: 300px;
+            height: 300px;
+            background-color: silver;
+        }
+    &lt;/style&gt;
+    &lt;script type=&quot;text/javascript&quot;&gt;
+        if (window.testRunner)
+            testRunner.dumpAsText();
+
+        function doTest() {
+            if (window.testRunner &amp;&amp; window.internals)
+                document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
+        }
+        window.addEventListener('load', doTest, false);
+    &lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+
+    &lt;div class=&quot;box&quot;&gt;
+        &lt;div class=&quot;child&quot;&gt;
+        &lt;/div&gt;
+    &lt;/div&gt;
+    &lt;pre id=&quot;layertree&quot;&gt;&lt;/pre&gt; 
+&lt;/body&gt;
+&lt;/html&gt;
</ins><span class="cx">Property changes on: trunk/LayoutTests/compositing/contents-opaque/overflow-hidden-child-layers.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (149913 => 149914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-05-10 23:42:07 UTC (rev 149913)
+++ trunk/Source/WebCore/ChangeLog        2013-05-11 00:31:59 UTC (rev 149914)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2013-05-10  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
+        Garbage down left side of nytimes.com page (if subscriber)
+        https://bugs.webkit.org/show_bug.cgi?id=115839
+
+        Reviewed by Antti Koivisto.
+        
+        RenderLayer::backgroundIsKnownToBeOpaqueInRect() would incorrectly return true
+        for layers where the given rect wasn't contained in the background rect, but
+        where some child layer obscured the rect, even though clipping hid part
+        of that child layer.
+        
+        So bail from RenderLayer::backgroundIsKnownToBeOpaqueInRect() if we have
+        any overflow clipping. This could be enhanced in future to test whether child
+        layers obscure the clipping rect, but that would be more expensive.
+
+        Test: compositing/contents-opaque/overflow-hidden-child-layers.html
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::backgroundIsKnownToBeOpaqueInRect):
+
</ins><span class="cx"> 2013-05-10  Eric Carlson  &lt;eric.carlson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         In-band captions not visible immediately after track mode change
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (149913 => 149914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp        2013-05-10 23:42:07 UTC (rev 149913)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp        2013-05-11 00:31:59 UTC (rev 149914)
</span><span class="lines">@@ -5585,8 +5585,15 @@
</span><span class="cx"> 
</span><span class="cx">     // FIXME: We currently only check the immediate renderer,
</span><span class="cx">     // which will miss many cases.
</span><del>-    return renderer()-&gt;backgroundIsKnownToBeOpaqueInRect(localRect)
-        || listBackgroundIsKnownToBeOpaqueInRect(posZOrderList(), localRect)
</del><ins>+    if (renderer()-&gt;backgroundIsKnownToBeOpaqueInRect(localRect))
+        return true;
+    
+    // We can't consult child layers if we clip, since they might cover
+    // parts of the rect that are clipped out.
+    if (renderer()-&gt;hasOverflowClip())
+        return false;
+    
+    return listBackgroundIsKnownToBeOpaqueInRect(posZOrderList(), localRect)
</ins><span class="cx">         || listBackgroundIsKnownToBeOpaqueInRect(negZOrderList(), localRect)
</span><span class="cx">         || listBackgroundIsKnownToBeOpaqueInRect(normalFlowList(), localRect);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>