<!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>[198242] trunk/Tools</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/198242">198242</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2016-03-15 16:51:19 -0700 (Tue, 15 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS Simulator] Test result snapshots are upside down
https://bugs.webkit.org/show_bug.cgi?id=154761
Reviewed by Simon Fraser.
* WebKitTestRunner/cg/TestInvocationCG.cpp:
(WTR::createCGContextFromImage):
(WTR::TestInvocation::dumpPixelsAndCompareWithExpected):
In <a href="http://trac.webkit.org/projects/webkit/changeset/97104">r97104</a>, Simon added code to take WindowServer snapshots, which came
in flipped, and added code to flip them back. At this point, WindowServer
snapshots got flipped, and software snapshots did not.
In <a href="http://trac.webkit.org/projects/webkit/changeset/140067">r140067</a>, Simon noticed that WindowServer ref test images were upside-down
on Mac (not sure why this changed), so turned off the flipping code (but
didn't delete it!). Now, WindowServer snapshots and software snapshots both
are not flipped.
In <a href="http://trac.webkit.org/projects/webkit/changeset/190304">r190304</a>, Carlos added an enum for the source of the snapshot ("WebView"
for window server snapshots, and "WebContent" for software snapshots),
and - critically - changed the flipping logic to flip software snapshots!
We didn't notice this on Mac because at this point we've made it so that
we *always* have WindowServer snapshots, but on iOS we still don't have
WindowServer snapshots, so now they're flipped.
And that's how we got here.
To restore the behavior from <a href="http://trac.webkit.org/projects/webkit/changeset/140067">r140067</a>, and correctly unflip snapshots on
iOS, just delete this code.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnercgTestInvocationCGcpp">trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (198241 => 198242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-03-15 23:29:53 UTC (rev 198241)
+++ trunk/Tools/ChangeLog 2016-03-15 23:51:19 UTC (rev 198242)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-03-15 Tim Horton <timothy_horton@apple.com>
+
+ [iOS Simulator] Test result snapshots are upside down
+ https://bugs.webkit.org/show_bug.cgi?id=154761
+
+ Reviewed by Simon Fraser.
+
+ * WebKitTestRunner/cg/TestInvocationCG.cpp:
+ (WTR::createCGContextFromImage):
+ (WTR::TestInvocation::dumpPixelsAndCompareWithExpected):
+ In r97104, Simon added code to take WindowServer snapshots, which came
+ in flipped, and added code to flip them back. At this point, WindowServer
+ snapshots got flipped, and software snapshots did not.
+
+ In r140067, Simon noticed that WindowServer ref test images were upside-down
+ on Mac (not sure why this changed), so turned off the flipping code (but
+ didn't delete it!). Now, WindowServer snapshots and software snapshots both
+ are not flipped.
+
+ In r190304, Carlos added an enum for the source of the snapshot ("WebView"
+ for window server snapshots, and "WebContent" for software snapshots),
+ and - critically - changed the flipping logic to flip software snapshots!
+
+ We didn't notice this on Mac because at this point we've made it so that
+ we *always* have WindowServer snapshots, but on iOS we still don't have
+ WindowServer snapshots, so now they're flipped.
+
+ And that's how we got here.
+
+ To restore the behavior from r140067, and correctly unflip snapshots on
+ iOS, just delete this code.
+
</ins><span class="cx"> 2016-03-15 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> run-api-tests doesn't print test name when the test crashes
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnercgTestInvocationCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp (198241 => 198242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp 2016-03-15 23:29:53 UTC (rev 198241)
+++ trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp 2016-03-15 23:51:19 UTC (rev 198242)
</span><span class="lines">@@ -46,12 +46,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WTR {
</span><span class="cx">
</span><del>-enum FlipGraphicsContextOrNot {
- DontFlipGraphicsContext,
- FlipGraphicsContext
-};
-
-static CGContextRef createCGContextFromImage(WKImageRef wkImage, FlipGraphicsContextOrNot flip = DontFlipGraphicsContext)
</del><ins>+static CGContextRef createCGContextFromImage(WKImageRef wkImage)
</ins><span class="cx"> {
</span><span class="cx"> RetainPtr<CGImageRef> image = adoptCF(WKImageCreateCGImage(wkImage));
</span><span class="cx">
</span><span class="lines">@@ -62,16 +57,9 @@
</span><span class="cx"> // Creating this bitmap in the device color space should prevent any color conversion when the image of the web view is drawn into it.
</span><span class="cx"> RetainPtr<CGColorSpaceRef> colorSpace = adoptCF(CGColorSpaceCreateDeviceRGB());
</span><span class="cx"> CGContextRef context = CGBitmapContextCreate(0, pixelsWide, pixelsHigh, 8, rowBytes, colorSpace.get(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host);
</span><ins>+
</ins><span class="cx">
</span><del>- if (flip == FlipGraphicsContext) {
- CGContextSaveGState(context);
- CGContextScaleCTM(context, 1, -1);
- CGContextTranslateCTM(context, 0, -static_cast<CGFloat>(pixelsHigh));
- }
-
</del><span class="cx"> CGContextDrawImage(context, CGRectMake(0, 0, pixelsWide, pixelsHigh), image.get());
</span><del>- if (flip == FlipGraphicsContext)
- CGContextRestoreGState(context);
</del><span class="cx">
</span><span class="cx"> return context;
</span><span class="cx"> }
</span><span class="lines">@@ -156,7 +144,7 @@
</span><span class="cx">
</span><span class="cx"> void TestInvocation::dumpPixelsAndCompareWithExpected(WKImageRef image, WKArrayRef repaintRects, SnapshotResultType snapshotType)
</span><span class="cx"> {
</span><del>- RetainPtr<CGContextRef> context = adoptCF(createCGContextFromImage(image, snapshotType == SnapshotResultType::WebView ? DontFlipGraphicsContext : FlipGraphicsContext));
</del><ins>+ RetainPtr<CGContextRef> context = adoptCF(createCGContextFromImage(image));
</ins><span class="cx">
</span><span class="cx"> // A non-null repaintRects array means we're doing a repaint test.
</span><span class="cx"> if (repaintRects)
</span></span></pre>
</div>
</div>
</body>
</html>