<!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>[198302] 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/198302">198302</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2016-03-16 14:31:18 -0700 (Wed, 16 Mar 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>[mac] Printing test snapshots are upside-down after <a href="http://trac.webkit.org/projects/webkit/changeset/198242">r198242</a>
https://bugs.webkit.org/show_bug.cgi?id=155543

Reviewed by Simon Fraser.

Source/WebCore:

* page/PrintContext.cpp:
(WebCore::PrintContext::spoolAllPagesWithBoundaries):
Stop PLATFORM(COCOA)-conditionally flipping here. Just paint.
This function is only used by the test runners so this doesn't have a
huge impact on anything else.

Tools:

* DumpRenderTree/mac/PixelDumpSupportMac.mm:
(createPagedBitmapContext):
Flip printing snapshots in DRT so that everything is right-side-up.

LayoutTests:

* TestExpectations:
Re-un-skip these tests.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagePrintContextcpp">trunk/Source/WebCore/page/PrintContext.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacPixelDumpSupportMacmm">trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198301 => 198302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-03-16 20:58:29 UTC (rev 198301)
+++ trunk/LayoutTests/ChangeLog        2016-03-16 21:31:18 UTC (rev 198302)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-03-16  Tim Horton  &lt;timothy_horton@apple.com&gt;
+
+        [mac] Printing test snapshots are upside-down after r198242
+        https://bugs.webkit.org/show_bug.cgi?id=155543
+
+        Reviewed by Simon Fraser.
+
+        * TestExpectations:
+        Re-un-skip these tests.
+
</ins><span class="cx"> 2016-03-16  Ryan Haddad  &lt;ryanhaddad@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Marking inspector/controller/runtime-controller.html as flaky on mac
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (198301 => 198302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations        2016-03-16 20:58:29 UTC (rev 198301)
+++ trunk/LayoutTests/TestExpectations        2016-03-16 21:31:18 UTC (rev 198302)
</span><span class="lines">@@ -897,10 +897,6 @@
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/94458 http/tests/security/aboutBlank/security-context-write.html [ Skip ]
</span><span class="cx"> 
</span><del>-webkit.org/b/155543 printing/quirks-percentage-height-body.html [ Skip ]
-webkit.org/b/155543 printing/quirks-percentage-height.html [ Skip ]
-webkit.org/b/155543 printing/standards-percentage-heights.html [ Skip ]
-
</del><span class="cx"> ########################################
</span><span class="cx"> ### START OF IndexedDB failures
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198301 => 198302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-03-16 20:58:29 UTC (rev 198301)
+++ trunk/Source/WebCore/ChangeLog        2016-03-16 21:31:18 UTC (rev 198302)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-03-16  Tim Horton  &lt;timothy_horton@apple.com&gt;
+
+        [mac] Printing test snapshots are upside-down after r198242
+        https://bugs.webkit.org/show_bug.cgi?id=155543
+
+        Reviewed by Simon Fraser.
+
+        * page/PrintContext.cpp:
+        (WebCore::PrintContext::spoolAllPagesWithBoundaries):
+        Stop PLATFORM(COCOA)-conditionally flipping here. Just paint.
+        This function is only used by the test runners so this doesn't have a
+        huge impact on anything else.
+
</ins><span class="cx"> 2016-03-16  Daniel Bates  &lt;dabates@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Update WebKit Feature Status page to include the status of Content Security Policy Level 2 and Level 3
</span></span></pre></div>
<a id="trunkSourceWebCorepagePrintContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PrintContext.cpp (198301 => 198302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PrintContext.cpp        2016-03-16 20:58:29 UTC (rev 198301)
+++ trunk/Source/WebCore/page/PrintContext.cpp        2016-03-16 21:31:18 UTC (rev 198302)
</span><span class="lines">@@ -341,10 +341,6 @@
</span><span class="cx">     graphicsContext.fillRect(FloatRect(0, 0, pageWidth, totalHeight));
</span><span class="cx"> 
</span><span class="cx">     graphicsContext.save();
</span><del>-#if PLATFORM(COCOA)
-    graphicsContext.translate(0, totalHeight);
-    graphicsContext.scale(FloatSize(1, -1));
-#endif
</del><span class="cx"> 
</span><span class="cx">     int currentHeight = 0;
</span><span class="cx">     for (size_t pageIndex = 0; pageIndex &lt; pageRects.size(); pageIndex++) {
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (198301 => 198302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2016-03-16 20:58:29 UTC (rev 198301)
+++ trunk/Tools/ChangeLog        2016-03-16 21:31:18 UTC (rev 198302)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-03-16  Tim Horton  &lt;timothy_horton@apple.com&gt;
+
+        [mac] Printing test snapshots are upside-down after r198242
+        https://bugs.webkit.org/show_bug.cgi?id=155543
+
+        Reviewed by Simon Fraser.
+
+        * DumpRenderTree/mac/PixelDumpSupportMac.mm:
+        (createPagedBitmapContext):
+        Flip printing snapshots in DRT so that everything is right-side-up.
+
</ins><span class="cx"> 2016-03-16  Alexey Proskuryakov  &lt;ap@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Update unit test for iOS debug queues.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacPixelDumpSupportMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm (198301 => 198302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm        2016-03-16 20:58:29 UTC (rev 198301)
+++ trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm        2016-03-16 21:31:18 UTC (rev 198302)
</span><span class="lines">@@ -205,7 +205,12 @@
</span><span class="cx">     size_t rowBytes = 0;
</span><span class="cx">     void* buffer = 0;
</span><span class="cx"> 
</span><del>-    RefPtr&lt;BitmapContext&gt; bitmapContext = createBitmapContext(pageWidthInPixels, numberOfPages * (pageHeightInPixels + 1) - 1, rowBytes, buffer);
-    [mainFrame printToCGContext:bitmapContext-&gt;cgContext() pageWidth:pageWidthInPixels pageHeight:pageHeightInPixels];
</del><ins>+    int totalHeight = numberOfPages * (pageHeightInPixels + 1) - 1;
+
+    RefPtr&lt;BitmapContext&gt; bitmapContext = createBitmapContext(pageWidthInPixels, totalHeight, rowBytes, buffer);
+    CGContextRef context = bitmapContext-&gt;cgContext();
+    CGContextTranslateCTM(context, 0, totalHeight);
+    CGContextScaleCTM(context, 1, -1);
+    [mainFrame printToCGContext:context pageWidth:pageWidthInPixels pageHeight:pageHeightInPixels];
</ins><span class="cx">     return bitmapContext.release();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>