<!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>[203543] 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/203543">203543</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2016-07-21 17:48:02 -0700 (Thu, 21 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/202927">r202927</a>): The internal size of the ImageBuffer is scaled twice by the context scaleFactor
https://bugs.webkit.org/show_bug.cgi?id=159981
<rdar://problem/27429465>
Reviewed by Myles Maxfield.
Source/WebCore:
The change to propagate color spaces through ImageBuffers created an
alternate version of createCompatibleBuffer. This version accidentally
attempted to take the display resolution (i.e. hidpi) into account
when creating the buffer, which meant it was being applied twice.
The fix is simply to remove that logic. The caller of the method
will take the resolution into account, the same way they did
with the old createCompatibleBuffer method.
Test: fast/hidpi/pdf-image-scaled.html
* platform/graphics/cg/ImageBufferCG.cpp:
(WebCore::ImageBuffer::createCompatibleBuffer): Don't calculate
a resolution - just use the value of 1.0.
LayoutTests:
* fast/hidpi/pdf-image-scaled-expected.html: Added.
* fast/hidpi/pdf-image-scaled.html: Added.
* fast/hidpi/resources/circle.pdf: 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="#trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp">trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasthidpipdfimagescaledexpectedhtml">trunk/LayoutTests/fast/hidpi/pdf-image-scaled-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasthidpipdfimagescaledhtml">trunk/LayoutTests/fast/hidpi/pdf-image-scaled.html</a></li>
<li><a href="#trunkLayoutTestsfasthidpiresourcescirclepdf">trunk/LayoutTests/fast/hidpi/resources/circle.pdf</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (203542 => 203543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-22 00:44:27 UTC (rev 203542)
+++ trunk/LayoutTests/ChangeLog 2016-07-22 00:48:02 UTC (rev 203543)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-07-21 Dean Jackson <dino@apple.com>
+
+ REGRESSION (r202927): The internal size of the ImageBuffer is scaled twice by the context scaleFactor
+ https://bugs.webkit.org/show_bug.cgi?id=159981
+ <rdar://problem/27429465>
+
+ Reviewed by Myles Maxfield.
+
+ * fast/hidpi/pdf-image-scaled-expected.html: Added.
+ * fast/hidpi/pdf-image-scaled.html: Added.
+ * fast/hidpi/resources/circle.pdf: Added.
+
</ins><span class="cx"> 2016-07-21 John Wilander <wilander@apple.com>
</span><span class="cx">
</span><span class="cx"> Block mixed content synchronous XHR
</span></span></pre></div>
<a id="trunkLayoutTestsfasthidpipdfimagescaledexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/hidpi/pdf-image-scaled-expected.html (0 => 203543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/hidpi/pdf-image-scaled-expected.html (rev 0)
+++ trunk/LayoutTests/fast/hidpi/pdf-image-scaled-expected.html 2016-07-22 00:48:02 UTC (rev 203543)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<style>
+body {
+ overflow: hidden;
+}
+img {
+ width: 800px;
+ height: 800px;
+ zoom: 0.2;
+ transform: translate(0);
+}
+</style>
+<img src="resources/circle.pdf">
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/hidpi/pdf-image-scaled-expected.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span><a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<ins>+Date Revision
</ins><span class="cx">\ No newline at end of property
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<ins>+text/html
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkLayoutTestsfasthidpipdfimagescaledhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/hidpi/pdf-image-scaled.html (0 => 203543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/hidpi/pdf-image-scaled.html (rev 0)
+++ trunk/LayoutTests/fast/hidpi/pdf-image-scaled.html 2016-07-22 00:48:02 UTC (rev 203543)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<style>
+body {
+ overflow: hidden;
+}
+img {
+ width: 800px;
+ height: 800px;
+ transform-origin: 0 0;
+ transform: scale(0.2);
+}
+</style>
+<img src="resources/circle.pdf">
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/hidpi/pdf-image-scaled.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span><a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<ins>+Date Revision
</ins><span class="cx">\ No newline at end of property
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<ins>+text/html
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkLayoutTestsfasthidpiresourcescirclepdf"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/fast/hidpi/resources/circle.pdf</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Index: trunk/LayoutTests/fast/hidpi/resources/circle.pdf
</span><span class="cx">===================================================================
</span><del>--- trunk/LayoutTests/fast/hidpi/resources/circle.pdf 2016-07-22 00:44:27 UTC (rev 203542)
</del><ins>+++ trunk/LayoutTests/fast/hidpi/resources/circle.pdf 2016-07-22 00:48:02 UTC (rev 203543)
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/hidpi/resources/circle.pdf
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<ins>+application/pdf
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203542 => 203543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-22 00:44:27 UTC (rev 203542)
+++ trunk/Source/WebCore/ChangeLog 2016-07-22 00:48:02 UTC (rev 203543)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-07-21 Dean Jackson <dino@apple.com>
+
+ REGRESSION (r202927): The internal size of the ImageBuffer is scaled twice by the context scaleFactor
+ https://bugs.webkit.org/show_bug.cgi?id=159981
+ <rdar://problem/27429465>
+
+ Reviewed by Myles Maxfield.
+
+ The change to propagate color spaces through ImageBuffers created an
+ alternate version of createCompatibleBuffer. This version accidentally
+ attempted to take the display resolution (i.e. hidpi) into account
+ when creating the buffer, which meant it was being applied twice.
+
+ The fix is simply to remove that logic. The caller of the method
+ will take the resolution into account, the same way they did
+ with the old createCompatibleBuffer method.
+
+ Test: fast/hidpi/pdf-image-scaled.html
+
+ * platform/graphics/cg/ImageBufferCG.cpp:
+ (WebCore::ImageBuffer::createCompatibleBuffer): Don't calculate
+ a resolution - just use the value of 1.0.
+
</ins><span class="cx"> 2016-07-21 John Wilander <wilander@apple.com>
</span><span class="cx">
</span><span class="cx"> Block mixed content synchronous XHR
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (203542 => 203543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2016-07-22 00:44:27 UTC (rev 203542)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2016-07-22 00:48:02 UTC (rev 203543)
</span><span class="lines">@@ -75,8 +75,6 @@
</span><span class="cx"> if (size.isEmpty())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- IntSize scaledSize = ImageBuffer::compatibleBufferSize(size, context);
- float resolutionScale = context.scaleFactor().width();
</del><span class="cx"> RetainPtr<CGColorSpaceRef> colorSpace;
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> CGContextRef cgContext = context.platformContext();
</span><span class="lines">@@ -99,8 +97,9 @@
</span><span class="cx"> colorSpace = sRGBColorSpaceRef();
</span><span class="cx"> #endif
</span><span class="cx"> RenderingMode renderingMode = context.renderingMode();
</span><ins>+ IntSize scaledSize = ImageBuffer::compatibleBufferSize(size, context);
</ins><span class="cx"> bool success = false;
</span><del>- std::unique_ptr<ImageBuffer> buffer(new ImageBuffer(scaledSize, resolutionScale, colorSpace.get(), renderingMode, success));
</del><ins>+ std::unique_ptr<ImageBuffer> buffer(new ImageBuffer(scaledSize, 1, colorSpace.get(), renderingMode, success));
</ins><span class="cx">
</span><span class="cx"> if (!success)
</span><span class="cx"> return nullptr;
</span></span></pre>
</div>
</div>
</body>
</html>