<!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>[173297] 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/173297">173297</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-09-04 17:55:10 -0700 (Thu, 04 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add some logging to help diagnose assertions in dumpWebViewAsPixelsAndCompareWithExpected() on bots
https://bugs.webkit.org/show_bug.cgi?id=136561
Reviewed by Tim Horton.
Log for calloc() and CGBitmapContextCreate() failures.
* DumpRenderTree/mac/PixelDumpSupportMac.mm:
(createBitmapContext):
(createBitmapContextFromWebView):</pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (173296 => 173297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-09-05 00:29:34 UTC (rev 173296)
+++ trunk/Tools/ChangeLog 2014-09-05 00:55:10 UTC (rev 173297)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-09-04 Simon Fraser <simon.fraser@apple.com>
+
+ Add some logging to help diagnose assertions in dumpWebViewAsPixelsAndCompareWithExpected() on bots
+ https://bugs.webkit.org/show_bug.cgi?id=136561
+
+ Reviewed by Tim Horton.
+
+ Log for calloc() and CGBitmapContextCreate() failures.
+
+ * DumpRenderTree/mac/PixelDumpSupportMac.mm:
+ (createBitmapContext):
+ (createBitmapContextFromWebView):
+
</ins><span class="cx"> 2014-09-04 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the Mac Production build after r173283.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacPixelDumpSupportMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm (173296 => 173297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm 2014-09-05 00:29:34 UTC (rev 173296)
+++ trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm 2014-09-05 00:55:10 UTC (rev 173297)
</span><span class="lines">@@ -54,15 +54,18 @@
</span><span class="cx"> rowBytes = (4 * pixelsWide + 63) & ~63; // Use a multiple of 64 bytes to improve CG performance
</span><span class="cx">
</span><span class="cx"> buffer = calloc(pixelsHigh, rowBytes);
</span><del>- if (!buffer)
- return 0;
</del><ins>+ if (!buffer) {
+ WTFLogAlways("DumpRenderTree: calloc(%llu, %llu) failed\n", pixelsHigh, rowBytes);
+ return nullptr;
+ }
</ins><span class="cx">
</span><span class="cx"> // Creating this bitmap in the device color space prevents 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(buffer, pixelsWide, pixelsHigh, 8, rowBytes, colorSpace.get(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host); // Use ARGB8 on PPC or BGRA8 on X86 to improve CG performance
</span><span class="cx"> if (!context) {
</span><span class="cx"> free(buffer);
</span><del>- return 0;
</del><ins>+ WTFLogAlways("DumpRenderTree: CGBitmapContextCreate(%p, %llu, %llu, 8, %llu, %p, 0x%x) failed\n", buffer, pixelsHigh, pixelsWide, rowBytes, colorSpace.get(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host);
+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return BitmapContext::createByAdoptingBitmapAndContext(buffer, context);
</span><span class="lines">@@ -115,10 +118,10 @@
</span><span class="cx"> size_t pixelsWide = static_cast<size_t>(webViewSize.width * deviceScaleFactor);
</span><span class="cx"> size_t pixelsHigh = static_cast<size_t>(webViewSize.height * deviceScaleFactor);
</span><span class="cx"> size_t rowBytes = 0;
</span><del>- void* buffer = 0;
</del><ins>+ void* buffer = nullptr;
</ins><span class="cx"> RefPtr<BitmapContext> bitmapContext = createBitmapContext(pixelsWide, pixelsHigh, rowBytes, buffer);
</span><span class="cx"> if (!bitmapContext)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> CGContextRef context = bitmapContext->cgContext();
</span><span class="cx"> // The final scaling gets doubled on the screen capture surface when we use the hidpi backingScaleFactor value for CTM.
</span><span class="cx"> // This is a workaround to push the scaling back.
</span></span></pre>
</div>
</div>
</body>
</html>