<!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>[179893] branches/safari-600.1.4.15-branch</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/179893">179893</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-02-10 15:49:28 -0800 (Tue, 10 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/178490">r178490</a>. rdar://problem/19709240</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchLayoutTestsChangeLog">branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorerenderingRenderBoxcpp">branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderBox.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchLayoutTestscompositingcontentsopaqueopaquewithscrolledexpectedtxt">branches/safari-600.1.4.15-branch/LayoutTests/compositing/contents-opaque/opaque-with-scrolled-expected.txt</a></li>
<li><a href="#branchessafari6001415branchLayoutTestscompositingcontentsopaqueopaquewithscrolledhtml">branches/safari-600.1.4.15-branch/LayoutTests/compositing/contents-opaque/opaque-with-scrolled.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbackgroundsopaquescrolledpaintbackgroundexpectedhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/backgrounds/opaque-scrolled-paint-background-expected.html</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastbackgroundsopaquescrolledpaintbackgroundhtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/backgrounds/opaque-scrolled-paint-background.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog (179892 => 179893)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-02-10 23:45:53 UTC (rev 179892)
+++ branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-02-10 23:49:28 UTC (rev 179893)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2015-02-10 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r178490.
+
+ 2015-01-14 Simon Fraser <simon.fraser@apple.com>
+
+ Graphics corruption after Find on some pages
+ https://bugs.webkit.org/show_bug.cgi?id=140489
+
+ Reviewed by Zalan Bujtas.
+
+ Two new tests. The first one just reports that we have an opaque compositing
+ layer. The second one tests the the user-visible symptom of the missing
+ background.
+
+ * compositing/contents-opaque/opaque-with-scrolled-expected.txt: Added.
+ * compositing/contents-opaque/opaque-with-scrolled.html: Added.
+ * fast/backgrounds/opaque-scrolled-paint-background-expected.html: Added.
+ * fast/backgrounds/opaque-scrolled-paint-background.html: Added.
+
+2015-02-10 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r178426.
</span><span class="cx">
</span><span class="cx"> 2015-01-14 Jer Noble <jer.noble@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchLayoutTestscompositingcontentsopaqueopaquewithscrolledexpectedtxtfromrev178490trunkLayoutTestscompositingcontentsopaqueopaquewithscrolledexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/compositing/contents-opaque/opaque-with-scrolled-expected.txt (from rev 178490, trunk/LayoutTests/compositing/contents-opaque/opaque-with-scrolled-expected.txt) (0 => 179893)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/compositing/contents-opaque/opaque-with-scrolled-expected.txt (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/compositing/contents-opaque/opaque-with-scrolled-expected.txt 2015-02-10 23:49:28 UTC (rev 179893)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 800.00 600.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 800.00 600.00)
+ (contentsOpaque 1)
+ (children 1
+ (GraphicsLayer
+ (position 20.00 20.00)
+ (bounds 200.00 200.00)
+ (contentsOpaque 1)
+ (drawsContent 1)
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestscompositingcontentsopaqueopaquewithscrolledhtmlfromrev178490trunkLayoutTestscompositingcontentsopaqueopaquewithscrolledhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/compositing/contents-opaque/opaque-with-scrolled.html (from rev 178490, trunk/LayoutTests/compositing/contents-opaque/opaque-with-scrolled.html) (0 => 179893)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/compositing/contents-opaque/opaque-with-scrolled.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/compositing/contents-opaque/opaque-with-scrolled.html 2015-02-10 23:49:28 UTC (rev 179893)
</span><span class="lines">@@ -0,0 +1,79 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ #indicator {
+ position: absolute;
+ top: 20px;
+ left: 20px;
+ width: 200px;
+ height: 200px;
+ background-color: red;
+ }
+
+ .composited {
+ -webkit-transform: translateZ(0);
+ }
+
+ .container {
+ position: absolute;
+ top: 20px;
+ left: 20px;
+ }
+
+ .solid-background {
+ position: relative;
+ float: left;
+ width: 200px;
+ height: 200px;
+ background-color: green;
+ z-index: 0;
+ }
+
+ #scrollable {
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ }
+
+ .opaque {
+ background-color: gray;
+ width: 100%;
+ height: 100%;
+ }
+
+ .non-opaque {
+ background-color: transparent;
+ width: 100%;
+ height: 100%;
+ }
+ </style>
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ window.addEventListener('load', function() {
+ document.getElementById('scrollable').scrollTop = 200;
+ if (window.testRunner && window.internals)
+ document.getElementById('layertree').innerText = window.internals.layerTreeAsText(document);
+ }, false);
+ </script>
+</head>
+<body>
+
+<div class="composited container">
+ <div class="solid-background">
+ <div id="scrollable">
+ <div class="opaque">
+ </div>
+ <div class="non-opaque">
+ </div>
+ </div>
+ </div>
+</div>
+
+<pre id="layertree"></pre>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbackgroundsopaquescrolledpaintbackgroundexpectedhtmlfromrev178490trunkLayoutTestsfastbackgroundsopaquescrolledpaintbackgroundexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/backgrounds/opaque-scrolled-paint-background-expected.html (from rev 178490, trunk/LayoutTests/fast/backgrounds/opaque-scrolled-paint-background-expected.html) (0 => 179893)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/backgrounds/opaque-scrolled-paint-background-expected.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/backgrounds/opaque-scrolled-paint-background-expected.html 2015-02-10 23:49:28 UTC (rev 179893)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ #indicator {
+ position: absolute;
+ top: 20px;
+ left: 20px;
+ width: 200px;
+ height: 200px;
+ background-color: green;
+ }
+ </style>
+</head>
+<body>
+
+<div id="indicator"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastbackgroundsopaquescrolledpaintbackgroundhtmlfromrev178490trunkLayoutTestsfastbackgroundsopaquescrolledpaintbackgroundhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/backgrounds/opaque-scrolled-paint-background.html (from rev 178490, trunk/LayoutTests/fast/backgrounds/opaque-scrolled-paint-background.html) (0 => 179893)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/backgrounds/opaque-scrolled-paint-background.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/backgrounds/opaque-scrolled-paint-background.html 2015-02-10 23:49:28 UTC (rev 179893)
</span><span class="lines">@@ -0,0 +1,70 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ #indicator {
+ position: absolute;
+ top: 20px;
+ left: 20px;
+ width: 200px;
+ height: 200px;
+ background-color: red;
+ }
+
+ .container {
+ position: absolute;
+ top: 20px;
+ left: 20px;
+ }
+
+ .solid-background {
+ position: relative;
+ float: left;
+ width: 200px;
+ height: 200px;
+ background-color: green;
+ z-index: 0;
+ }
+
+ #scrollable {
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ }
+
+ .opaque {
+ background-color: gray;
+ width: 100%;
+ height: 100%;
+ }
+
+ .non-opaque {
+ background-color: transparent;
+ width: 100%;
+ height: 100%;
+ }
+ </style>
+ <script>
+ window.addEventListener('load', function() {
+ document.getElementById('scrollable').scrollTop = 200;
+ }, false);
+ </script>
+</head>
+<body>
+
+<div id="indicator"></div>
+
+<div class="container">
+ <div class="solid-background">
+ <div id="scrollable">
+ <div class="opaque">
+ </div>
+ <div class="non-opaque">
+ </div>
+ </div>
+ </div>
+</div>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (179892 => 179893)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-02-10 23:45:53 UTC (rev 179892)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-02-10 23:49:28 UTC (rev 179893)
</span><span class="lines">@@ -1,5 +1,38 @@
</span><span class="cx"> 2015-02-10 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r178490.
+
+ 2015-01-14 Simon Fraser <simon.fraser@apple.com>
+
+ Graphics corruption after Find on some pages
+ https://bugs.webkit.org/show_bug.cgi?id=140489
+
+ Reviewed by Zalan Bujtas.
+
+ After doing a Find on http://shop.outlier.cc/shop/retail/chino.html,
+ garbage could appear on some parts of the page. This is caused by creating
+ a compositing layer which is marked as opaque, yet failing to paint the entire
+ layer contents.
+
+ This was caused by a bug in RenderBox::computeBackgroundIsKnownToBeObscured()
+ logic. On the page in question, doing a Find could cause overflow:hidden sections
+ to get scrolled (since Find can reveal the selection by scrolling overflow).
+ However, the render tree walking under RenderBox::foregroundIsKnownToBeOpaqueInRect()
+ fails to take overflow scrolling into account, so gives the wrong answer
+ in some content configurations. As a result, we'd think that the background
+ is obscured, and never paint it.
+
+ Conservative fix is to have isCandidateForOpaquenessTest() return false
+ when the content has any non-zero scroll offset.
+
+ Tests: compositing/contents-opaque/opaque-with-scrolled.html
+ fast/backgrounds/opaque-scrolled-paint-background.html
+
+ * rendering/RenderBox.cpp:
+ (WebCore::isCandidateForOpaquenessTest):
+
+2015-02-10 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r178426.
</span><span class="cx">
</span><span class="cx"> 2015-01-14 Jer Noble <jer.noble@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderBox.cpp (179892 => 179893)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderBox.cpp 2015-02-10 23:45:53 UTC (rev 179892)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderBox.cpp 2015-02-10 23:49:28 UTC (rev 179893)
</span><span class="lines">@@ -1397,6 +1397,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (childLayer->hasTransform() || childLayer->isTransparent() || childLayer->hasFilter())
</span><span class="cx"> return false;
</span><ins>+ if (!childBox.scrolledContentOffset().isZero())
+ return false;
</ins><span class="cx"> }
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>