<!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>[174955] releases/WebKitGTK/webkit-2.6/Source</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/174955">174955</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-21 07:12:24 -0700 (Tue, 21 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/174287">r174287</a> - WKWebView snapshot of Daring Fireball has the wrong color in the obscured inset
https://bugs.webkit.org/show_bug.cgi?id=137383
<rdar://problem/18535439>
Reviewed by Sam Weinig.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::snapshotAtSize):
Use documentBackgroundColor instead of baseBackgroundColor if backgroundShouldExtendBeyondPage is set.
* rendering/RenderView.cpp:
(WebCore::RenderView::paintBoxDecorations):
Use documentBackgroundColor instead of baseBackgroundColor if backgroundShouldExtendBeyondPage is set.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorerenderingRenderViewcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2WebProcessWebPageWebPagecpp">releases/WebKitGTK/webkit-2.6/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (174954 => 174955)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-21 13:33:06 UTC (rev 174954)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-21 14:12:24 UTC (rev 174955)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-10-03 Tim Horton <timothy_horton@apple.com>
+
+ WKWebView snapshot of Daring Fireball has the wrong color in the obscured inset
+ https://bugs.webkit.org/show_bug.cgi?id=137383
+ <rdar://problem/18535439>
+
+ Reviewed by Sam Weinig.
+
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::paintBoxDecorations):
+ Use documentBackgroundColor instead of baseBackgroundColor if backgroundShouldExtendBeyondPage is set.
+
</ins><span class="cx"> 2014-10-03 Bear Travis <betravis@adobe.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r173531): Use after free in WebCore::RenderStyle::fontMetrics /
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderView.cpp (174954 => 174955)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderView.cpp 2014-10-21 13:33:06 UTC (rev 174954)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderView.cpp 2014-10-21 14:12:24 UTC (rev 174955)
</span><span class="lines">@@ -570,8 +570,8 @@
</span><span class="cx"> rootObscuresBackground = rendererObscuresBackground(rootRenderer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- compositor().setRootExtendedBackgroundColor(frameView().frame().settings().backgroundShouldExtendBeyondPage()
- ? frameView().documentBackgroundColor() : Color());
</del><ins>+ bool backgroundShouldExtendBeyondPage = frameView().frame().settings().backgroundShouldExtendBeyondPage();
+ compositor().setRootExtendedBackgroundColor(backgroundShouldExtendBeyondPage ? frameView().documentBackgroundColor() : Color());
</ins><span class="cx">
</span><span class="cx"> Page* page = document().page();
</span><span class="cx"> float pageScaleFactor = page ? page->pageScaleFactor() : 1;
</span><span class="lines">@@ -582,12 +582,14 @@
</span><span class="cx">
</span><span class="cx"> // This code typically only executes if the root element's visibility has been set to hidden,
</span><span class="cx"> // if there is a transform on the <html>, or if there is a page scale factor less than 1.
</span><del>- // Only fill with the base background color (typically white) if we're the root document,
</del><ins>+ // Only fill with a background color (typically white) if we're the root document,
</ins><span class="cx"> // since iframes/frames with no background in the child document should show the parent's background.
</span><ins>+ // We use the base background color unless the backgroundShouldExtendBeyondPage setting is set,
+ // in which case we use the document's background color.
</ins><span class="cx"> if (frameView().isTransparent()) // FIXME: This needs to be dynamic. We should be able to go back to blitting if we ever stop being transparent.
</span><span class="cx"> frameView().setCannotBlitToWindow(); // The parent must show behind the child.
</span><span class="cx"> else {
</span><del>- Color backgroundColor = frameView().baseBackgroundColor();
</del><ins>+ Color backgroundColor = backgroundShouldExtendBeyondPage ? frameView().documentBackgroundColor() : frameView().baseBackgroundColor();
</ins><span class="cx"> if (backgroundColor.alpha()) {
</span><span class="cx"> CompositeOperator previousOperator = paintInfo.context->compositeOperation();
</span><span class="cx"> paintInfo.context->setCompositeOperation(CompositeCopy);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog (174954 => 174955)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2014-10-21 13:33:06 UTC (rev 174954)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2014-10-21 14:12:24 UTC (rev 174955)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-10-03 Tim Horton <timothy_horton@apple.com>
+
+ WKWebView snapshot of Daring Fireball has the wrong color in the obscured inset
+ https://bugs.webkit.org/show_bug.cgi?id=137383
+ <rdar://problem/18535439>
+
+ Reviewed by Sam Weinig.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::snapshotAtSize):
+ Use documentBackgroundColor instead of baseBackgroundColor if backgroundShouldExtendBeyondPage is set.
+
</ins><span class="cx"> 2014-10-02 JinYoung Hur <hurims@gmail.com>
</span><span class="cx">
</span><span class="cx"> Minor bug in UIClient::exceededDatabaseQuota()
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (174954 => 174955)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-10-21 13:33:06 UTC (rev 174954)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-10-21 14:12:24 UTC (rev 174955)
</span><span class="lines">@@ -1667,7 +1667,8 @@
</span><span class="cx">
</span><span class="cx"> auto graphicsContext = snapshot->bitmap()->createGraphicsContext();
</span><span class="cx">
</span><del>- graphicsContext->fillRect(IntRect(IntPoint(), bitmapSize), frameView->baseBackgroundColor(), ColorSpaceDeviceRGB);
</del><ins>+ Color backgroundColor = coreFrame->settings().backgroundShouldExtendBeyondPage() ? frameView->documentBackgroundColor() : frameView->baseBackgroundColor();
+ graphicsContext->fillRect(IntRect(IntPoint(), bitmapSize), backgroundColor, ColorSpaceDeviceRGB);
</ins><span class="cx">
</span><span class="cx"> if (!(options & SnapshotOptionsExcludeDeviceScaleFactor)) {
</span><span class="cx"> double deviceScaleFactor = corePage()->deviceScaleFactor();
</span></span></pre>
</div>
</div>
</body>
</html>