<!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>[176880] 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/176880">176880</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-12-05 15:33:55 -0800 (Fri, 05 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] DumpRenderTree produces many reference test mismatches
https://bugs.webkit.org/show_bug.cgi?id=139314
Reviewed by Simon Fraser.
Fixes an issue where the scale factor used to render the snapshot taken by
DumpRenderTree may differ from the device scale factor. In particular, the
scale factor used to render a snapshot of a test may differ from the scale
factor used to render the snapshot of its expected result.
Currently DumpRenderTree uses SPI, -[UIView newSnapshotForRect], on iOS to
snapshot the UIWebBrowserView. This SPI always render using a scale factor
of one when the backing store for the LegacyTileLayer objects were out-of-
date regardless of the device scale factor. Instead we should use UIImage
and CALayer API to perform the snapshot with respect to the device scale
factor.
Additionally write iOS pixel dump support logic in terms of existing
DumpRenderTree abstractions so as to support generating and comparing
pixel dump checksums as well as make the iOS code more consistent with
the logic used by other ports.
* DumpRenderTree/PixelDumpSupport.cpp:
(dumpWebViewAsPixelsAndCompareWithExpected): Removed !PLATFORM(IOS)-guard.
* DumpRenderTree/ios/PixelDumpSupportIOS.mm:
(BitmapContext::createFromUIImage): Added.
(BitmapContext::pixelData): Added.
(BitmapContext::BitmapContext): Added.
(computeMD5HashStringForBitmapContext): Added.
(dumpBitmap): Added.
(createBitmapContextFromWebView): Moved logic from dumpWebViewAsPixelsAndCompareWithExpected() to here.
(dumpWebViewAsPixelsAndCompareWithExpected): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreePixelDumpSupportcpp">trunk/Tools/DumpRenderTree/PixelDumpSupport.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosPixelDumpSupportIOSmm">trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (176879 => 176880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-12-05 23:25:31 UTC (rev 176879)
+++ trunk/Tools/ChangeLog 2014-12-05 23:33:55 UTC (rev 176880)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2014-12-05 Daniel Bates <dabates@apple.com>
+
+ [iOS] DumpRenderTree produces many reference test mismatches
+ https://bugs.webkit.org/show_bug.cgi?id=139314
+
+ Reviewed by Simon Fraser.
+
+ Fixes an issue where the scale factor used to render the snapshot taken by
+ DumpRenderTree may differ from the device scale factor. In particular, the
+ scale factor used to render a snapshot of a test may differ from the scale
+ factor used to render the snapshot of its expected result.
+
+ Currently DumpRenderTree uses SPI, -[UIView newSnapshotForRect], on iOS to
+ snapshot the UIWebBrowserView. This SPI always render using a scale factor
+ of one when the backing store for the LegacyTileLayer objects were out-of-
+ date regardless of the device scale factor. Instead we should use UIImage
+ and CALayer API to perform the snapshot with respect to the device scale
+ factor.
+
+ Additionally write iOS pixel dump support logic in terms of existing
+ DumpRenderTree abstractions so as to support generating and comparing
+ pixel dump checksums as well as make the iOS code more consistent with
+ the logic used by other ports.
+
+ * DumpRenderTree/PixelDumpSupport.cpp:
+ (dumpWebViewAsPixelsAndCompareWithExpected): Removed !PLATFORM(IOS)-guard.
+ * DumpRenderTree/ios/PixelDumpSupportIOS.mm:
+ (BitmapContext::createFromUIImage): Added.
+ (BitmapContext::pixelData): Added.
+ (BitmapContext::BitmapContext): Added.
+ (computeMD5HashStringForBitmapContext): Added.
+ (dumpBitmap): Added.
+ (createBitmapContextFromWebView): Moved logic from dumpWebViewAsPixelsAndCompareWithExpected() to here.
+ (dumpWebViewAsPixelsAndCompareWithExpected): Deleted.
+
</ins><span class="cx"> 2014-12-05 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Give all web pages a website data store
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreePixelDumpSupportcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/PixelDumpSupport.cpp (176879 => 176880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/PixelDumpSupport.cpp 2014-12-05 23:25:31 UTC (rev 176879)
+++ trunk/Tools/DumpRenderTree/PixelDumpSupport.cpp 2014-12-05 23:33:55 UTC (rev 176880)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> #include "PixelDumpSupportCairo.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
</del><span class="cx"> void dumpWebViewAsPixelsAndCompareWithExpected(const std::string& expectedHash)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<BitmapContext> context;
</span><span class="lines">@@ -74,7 +73,6 @@
</span><span class="cx"> if (dumpImage)
</span><span class="cx"> dumpBitmap(context.get(), actualHash);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static void appendIntToVector(unsigned number, Vector<unsigned char>& vector)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosPixelDumpSupportIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm (176879 => 176880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm 2014-12-05 23:25:31 UTC (rev 176879)
+++ trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm 2014-12-05 23:33:55 UTC (rev 176880)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #import "PixelDumpSupport.h"
</span><span class="cx">
</span><span class="cx"> #import "DumpRenderTree.h"
</span><del>-#import "PixelDumpSupportCG.h"
</del><span class="cx">
</span><span class="cx"> #define COMMON_DIGEST_FOR_OPENSSL
</span><span class="cx"> #import <CommonCrypto/CommonDigest.h>
</span><span class="lines">@@ -40,38 +39,56 @@
</span><span class="cx"> #import <UIKit/UIView_Private.h>
</span><span class="cx"> #import <UIKit/UIWebBrowserView.h>
</span><span class="cx"> #import <WebKit/WebCoreThread.h>
</span><del>-
</del><ins>+#import <WebKitSystemInterface.h>
+#import <wtf/RefCounted.h>
</ins><span class="cx"> #import <wtf/RefPtr.h>
</span><ins>+#import <wtf/RetainPtr.h>
</ins><span class="cx">
</span><span class="cx"> extern UIWebBrowserView *gWebBrowserView;
</span><span class="cx">
</span><del>-PassRefPtr<BitmapContext> createBitmapContextFromWebView(bool onscreen, bool incrementalRepaint, bool sweepHorizontally,
- bool drawSelectionRect)
</del><ins>+class BitmapContext : public RefCounted<BitmapContext> {
+public:
+ static PassRefPtr<BitmapContext> createFromUIImage(UIImage *image)
+ {
+ return adoptRef(new BitmapContext(image));
+ }
+
+ NSData *pixelData() const { return m_pixelData.get(); }
+
+private:
+ BitmapContext(UIImage *image)
+ : m_pixelData(UIImagePNGRepresentation(image))
+ {
+ }
+
+ RetainPtr<NSData> m_pixelData;
+};
+
+void computeMD5HashStringForBitmapContext(BitmapContext* context, char hashString[33])
</ins><span class="cx"> {
</span><del>- // FIXME: Implement; see PixelDumpSupportMac.mm.
- return 0;
</del><ins>+ unsigned char result[CC_MD5_DIGEST_LENGTH];
+ CC_MD5([context->pixelData() bytes], [context->pixelData() length], result);
+ hashString[0] = '\0';
+ for (int i = 0; i < 16; ++i)
+ snprintf(hashString, 33, "%s%02x", hashString, result[i]);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void dumpWebViewAsPixelsAndCompareWithExpected(const std::string& expectedHash)
</del><ins>+void dumpBitmap(BitmapContext* context, const char* checksum)
</ins><span class="cx"> {
</span><ins>+ printPNG(static_cast<const unsigned char*>([context->pixelData() bytes]), [context->pixelData() length], checksum);
+}
+
+PassRefPtr<BitmapContext> createBitmapContextFromWebView(bool onscreen, bool incrementalRepaint, bool sweepHorizontally, bool drawSelectionRect)
+{
</ins><span class="cx"> // TODO: <rdar://problem/6558366> DumpRenderTree: Investigate testRepaintSweepHorizontally and dumpSelectionRect
</span><span class="cx"> WebThreadLock();
</span><span class="cx"> [gWebBrowserView layoutIfNeeded]; // Re-enables tile painting, which was disabled when committing the frame load.
</span><span class="cx"> [gWebBrowserView setNeedsDisplay];
</span><del>- RetainPtr<CGImageRef> snapshot = adoptCF([gWebBrowserView newSnapshotWithRect:[[mainFrame webView] frame]]);
- NSData *pngData = UIImagePNGRepresentation([UIImage imageWithCGImage:snapshot.get()]);
-
- // Hash the PNG data
- char actualHash[33];
- unsigned char result[CC_MD5_DIGEST_LENGTH];
- CC_MD5([pngData bytes], [pngData length], result);
- actualHash[0] = '\0';
- for (int i = 0; i < 16; i++)
- snprintf(actualHash, 33, "%s%02x", actualHash, result[i]);
- printf("\nActualHash: %s\n", actualHash);
-
- // Print the image
- printf("Content-Type: image/png\n");
- printf("Content-Length: %lu\n", (unsigned long)[pngData length]);
- fwrite([pngData bytes], 1, [pngData length], stdout);
</del><ins>+
+ UIGraphicsBeginImageContextWithOptions([[mainFrame webView] frame].size, YES /* opaque */, WKGetScreenScaleFactor());
+ [[gWebBrowserView layer] renderInContext:UIGraphicsGetCurrentContext()];
+ RefPtr<BitmapContext> context = BitmapContext::createFromUIImage(UIGraphicsGetImageFromCurrentImageContext());
+ UIGraphicsEndImageContext();
+
+ return context.release();
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>