<!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>[172291] 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/172291">172291</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2014-08-07 15:25:11 -0700 (Thu, 07 Aug 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fixed backgrounds don't paint in blurred inset areas
https://bugs.webkit.org/show_bug.cgi?id=135712

Reviewed by Simon Fraser.

Source/WebCore:

Background geometry calculations for fixed background need to use the larger 
visible rect. 

* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::calculateBackgroundImageGeometry):

LayoutTests:

Unfortunately for this test to be valid in WK2, it needs to be run from the 
platform/mac-wk2/tiled-drawing directory so that tiled drawing is enabled. So 
there are two copies of the test so that we can get coverage for WK1 and WK2.
* platform/mac-wk1/TestExpectations:
* platform/mac-wk1/fast: Added.
* platform/mac-wk1/fast/backgrounds: Added.
* platform/mac-wk1/fast/backgrounds/resources: Added.
* platform/mac-wk1/fast/backgrounds/resources/green.png: Added.
* platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment-expected.html: Added.
* platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment.html: Added.
* platform/mac-wk2/tiled-drawing/resources/green.png: Added.
* platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment-expected.html: Added.
* platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment.html: Added.
* platform/mac/fast/backgrounds/resources: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/platform/mac/fast/backgrounds/resources/</li>
<li>trunk/LayoutTests/platform/mac-wk1/fast/</li>
<li>trunk/LayoutTests/platform/mac-wk1/fast/backgrounds/</li>
<li>trunk/LayoutTests/platform/mac-wk1/fast/backgrounds/resources/</li>
<li><a href="#trunkLayoutTestsplatformmacwk1fastbackgroundsresourcesgreenpng">trunk/LayoutTests/platform/mac-wk1/fast/backgrounds/resources/green.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1fastbackgroundstopcontentinsetfixedattachmentexpectedhtml">trunk/LayoutTests/platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment-expected.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1fastbackgroundstopcontentinsetfixedattachmenthtml">trunk/LayoutTests/platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingresourcesgreenpng">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/resources/green.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingtopcontentinsetfixedattachmentexpectedhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment-expected.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingtopcontentinsetfixedattachmenthtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (172290 => 172291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-08-07 22:22:13 UTC (rev 172290)
+++ trunk/LayoutTests/ChangeLog        2014-08-07 22:25:11 UTC (rev 172291)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-08-07  Beth Dakin  &lt;bdakin@apple.com&gt;
+
+        Fixed backgrounds don't paint in blurred inset areas
+        https://bugs.webkit.org/show_bug.cgi?id=135712
+
+        Reviewed by Simon Fraser.
+
+        Unfortunately for this test to be valid in WK2, it needs to be run from the 
+        platform/mac-wk2/tiled-drawing directory so that tiled drawing is enabled. So 
+        there are two copies of the test so that we can get coverage for WK1 and WK2.
+        * platform/mac-wk1/TestExpectations:
+        * platform/mac-wk1/fast: Added.
+        * platform/mac-wk1/fast/backgrounds: Added.
+        * platform/mac-wk1/fast/backgrounds/resources: Added.
+        * platform/mac-wk1/fast/backgrounds/resources/green.png: Added.
+        * platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment-expected.html: Added.
+        * platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment.html: Added.
+        * platform/mac-wk2/tiled-drawing/resources/green.png: Added.
+        * platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment-expected.html: Added.
+        * platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment.html: Added.
+        * platform/mac/fast/backgrounds/resources: Added.
+
</ins><span class="cx"> 2014-08-07  Mark Lam  &lt;mark.lam@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         http/tests/security/cross-frame-access-enumeration.html fails after FTLOPT merge.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (172290 => 172291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations        2014-08-07 22:22:13 UTC (rev 172290)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations        2014-08-07 22:25:11 UTC (rev 172291)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> [ MountainLion Mavericks ] platform/mac/fast/events/content-inset-hit-testing.html [ Skip ]
</span><span class="cx"> [ MountainLion Mavericks ] platform/mac/fast/events/content-inset-hit-testing-in-frame.html [ Skip ]
</span><span class="cx"> [ MountainLion Mavericks ] platform/mac/fast/scrolling/scroll-select-bottom-test.html [ Skip ]
</span><ins>+[ MountainLion Mavericks ] platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment.html [ Skip ]
</ins><span class="cx"> 
</span><span class="cx"> ### END OF (2) Failures without bug reports
</span><span class="cx"> ########################################
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1fastbackgroundsresourcesgreenpng"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/platform/mac-wk1/fast/backgrounds/resources/green.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/platform/mac-wk1/fast/backgrounds/resources/green.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestsplatformmacwk1fastbackgroundstopcontentinsetfixedattachmentexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment-expected.html (0 => 172291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment-expected.html                                (rev 0)
+++ trunk/LayoutTests/platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment-expected.html        2014-08-07 22:25:11 UTC (rev 172291)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+&lt;html&gt;
+&lt;head&gt;
+&lt;style&gt;
+
+body {
+    height:2000px;
+    margin:0;
+    overflow:hidden;
+}
+
+#fixed-background-box {
+    width:400px;
+    height:600px;
+    background-image:url(resources/green.png);
+    background-attachment:fixed;
+}
+
+&lt;/style&gt;
+&lt;/head&gt;
+
+&lt;body&gt;
+
+&lt;div id=&quot;fixed-background-box&quot;&gt;&lt;/div&gt;
+
+&lt;/body&gt;
+&lt;html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1fastbackgroundstopcontentinsetfixedattachmenthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment.html (0 => 172291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment.html                                (rev 0)
+++ trunk/LayoutTests/platform/mac-wk1/fast/backgrounds/top-content-inset-fixed-attachment.html        2014-08-07 22:25:11 UTC (rev 172291)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+&lt;html&gt;
+&lt;head&gt;
+&lt;style&gt;
+
+body {
+    height:2000px;
+    margin:0;
+    overflow:hidden;
+}
+
+#fixed-background-box {
+    width:400px;
+    height:600px;
+    background-image:url(resources/green.png);
+    background-attachment:fixed;
+}
+
+&lt;/style&gt;
+
+&lt;script&gt;
+function runTest() {
+    if (window.internals)
+        window.internals.setTopContentInset(100);
+    window.scrollTo(0, 100);
+}
+
+window.addEventListener('load', runTest, false);
+&lt;/script&gt;
+&lt;/head&gt;
+
+&lt;body&gt;
+
+&lt;div id=&quot;fixed-background-box&quot;&gt;&lt;/div&gt;
+
+&lt;/body&gt;
+&lt;html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingresourcesgreenpng"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/resources/green.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/resources/green.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingtopcontentinsetfixedattachmentexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment-expected.html (0 => 172291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment-expected.html                                (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment-expected.html        2014-08-07 22:25:11 UTC (rev 172291)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+&lt;html&gt;
+&lt;head&gt;
+&lt;style&gt;
+
+body {
+    height:2000px;
+    margin:0;
+    overflow:hidden;
+}
+
+#fixed-background-box {
+    width:400px;
+    height:600px;
+    background-image:url(resources/green.png);
+    background-attachment:fixed;
+}
+
+&lt;/style&gt;
+&lt;/head&gt;
+
+&lt;body&gt;
+
+&lt;div id=&quot;fixed-background-box&quot;&gt;&lt;/div&gt;
+
+&lt;/body&gt;
+&lt;html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingtopcontentinsetfixedattachmenthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment.html (0 => 172291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment.html                                (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/top-content-inset-fixed-attachment.html        2014-08-07 22:25:11 UTC (rev 172291)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+&lt;html&gt;
+&lt;head&gt;
+&lt;style&gt;
+
+body {
+    height:2000px;
+    margin:0;
+    overflow:hidden;
+}
+
+#fixed-background-box {
+    width:400px;
+    height:600px;
+    background-image:url(resources/green.png);
+    background-attachment:fixed;
+}
+
+&lt;/style&gt;
+
+&lt;script&gt;
+function runTest() {
+    if (window.internals)
+        window.internals.setTopContentInset(100);
+    window.scrollTo(0, 100);
+}
+
+window.addEventListener('load', runTest, false);
+&lt;/script&gt;
+&lt;/head&gt;
+
+&lt;body&gt;
+
+&lt;div id=&quot;fixed-background-box&quot;&gt;&lt;/div&gt;
+
+&lt;/body&gt;
+&lt;html&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172290 => 172291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-08-07 22:22:13 UTC (rev 172290)
+++ trunk/Source/WebCore/ChangeLog        2014-08-07 22:25:11 UTC (rev 172291)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-08-07  Beth Dakin  &lt;bdakin@apple.com&gt;
+
+        Fixed backgrounds don't paint in blurred inset areas
+        https://bugs.webkit.org/show_bug.cgi?id=135712
+
+        Reviewed by Simon Fraser.
+
+        Background geometry calculations for fixed background need to use the larger 
+        visible rect. 
+
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::calculateBackgroundImageGeometry):
+
</ins><span class="cx"> 2014-08-07  Jer Noble  &lt;jer.noble@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [EME][Mac] Error codes returned by AVSampleBufferDisplayLayer are negative; clip when passed to JavaScript as doubles.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (172290 => 172291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp        2014-08-07 22:22:13 UTC (rev 172290)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp        2014-08-07 22:25:11 UTC (rev 172291)
</span><span class="lines">@@ -1127,11 +1127,12 @@
</span><span class="cx">         if (frame().settings().fixedBackgroundsPaintRelativeToDocument())
</span><span class="cx">             viewportRect = view().unscaledDocumentRect();
</span><span class="cx">         else {
</span><del>-            viewportRect = view().viewRect();
</del><ins>+            viewportRect.setSize(view().frameView().unscaledVisibleContentSizeIncludingObscuredArea());
+            top += view().frameView().topContentInset(ScrollView::TopContentInsetType::WebCoreOrPlatformContentInset);
</ins><span class="cx">             if (fixedBackgroundPaintsInLocalCoordinates())
</span><span class="cx">                 viewportRect.setLocation(LayoutPoint());
</span><span class="cx">             else
</span><del>-                viewportRect.setLocation(toLayoutPoint(view().frameView().scrollOffsetForFixedPosition()));
</del><ins>+                viewportRect.setLocation(toLayoutPoint(view().frameView().documentScrollOffsetRelativeToViewOrigin()));
</ins><span class="cx">         }
</span><span class="cx">         
</span><span class="cx">         if (paintContainer)
</span></span></pre>
</div>
</div>

</body>
</html>