<!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>[202404] 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/202404">202404</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-06-23 17:08:00 -0700 (Thu, 23 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Make DumpRenderTree and WebKitTestRunner in the simulator use render server snapshotting
https://bugs.webkit.org/show_bug.cgi?id=159077
Reviewed by Tim Horton.
Source/WebCore:
Add CARenderServer SPIs.
Test: fast/harness/snapshot-captures-compositing.html
* platform/spi/cocoa/QuartzCoreSPI.h:
Tools:
Fix both DRT and WTR for iOS to use CARenderServerRenderLayerWithTransform() on the view's layer.
This allows them to capture compositing layers in snapshots, rather than doing a software paint,
thus enabling testing of more things.
* DumpRenderTree/cg/PixelDumpSupportCG.cpp:
(createBitmapContext): Moved to this file to share it.
* DumpRenderTree/cg/PixelDumpSupportCG.h:
* DumpRenderTree/ios/PixelDumpSupportIOS.mm:
(createBitmapContextFromWebView):
(BitmapContext::createFromUIImage): Deleted.
(BitmapContext::pixelData): Deleted.
(BitmapContext::BitmapContext): Deleted.
(computeMD5HashStringForBitmapContext): Deleted.
(dumpBitmap): Deleted.
* DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig: Don't exclude PixelDumpSupportCG.cpp.
* DumpRenderTree/mac/PixelDumpSupportMac.mm:
(createPagedBitmapContext):
(createBitmapContext): Deleted.
* WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig: link with QuartzCore.
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::dump): Deleted.
* WebKitTestRunner/ios/PlatformWebViewIOS.mm:
(WTR::PlatformWebView::windowSnapshotImage):
LayoutTests:
Test that fails if snapshotting doesn't correctly snapshot 3D transforms.
* fast/harness/snapshot-captures-compositing-expected.html: Added.
* fast/harness/snapshot-captures-compositing.html: 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="#trunkSourceWebCoreplatformspicocoaQuartzCoreSPIh">trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreecgPixelDumpSupportCGcpp">trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreecgPixelDumpSupportCGh">trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.h</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosPixelDumpSupportIOSmm">trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacConfigurationsDumpRenderTreeLibraryxcconfig">trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig</a></li>
<li><a href="#trunkToolsDumpRenderTreemacPixelDumpSupportMacmm">trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerConfigurationsWebKitTestRunnerAppxcconfig">trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePagecpp">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunneriosPlatformWebViewIOSmm">trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastharnesssnapshotcapturescompositingexpectedhtml">trunk/LayoutTests/fast/harness/snapshot-captures-compositing-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastharnesssnapshotcapturescompositinghtml">trunk/LayoutTests/fast/harness/snapshot-captures-compositing.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202403 => 202404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-24 00:00:28 UTC (rev 202403)
+++ trunk/LayoutTests/ChangeLog 2016-06-24 00:08:00 UTC (rev 202404)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-06-23 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS] Make DumpRenderTree and WebKitTestRunner in the simulator use render server snapshotting
+ https://bugs.webkit.org/show_bug.cgi?id=159077
+
+ Reviewed by Tim Horton.
+
+ Test that fails if snapshotting doesn't correctly snapshot 3D transforms.
+
+ * fast/harness/snapshot-captures-compositing-expected.html: Added.
+ * fast/harness/snapshot-captures-compositing.html: Added.
+
</ins><span class="cx"> 2016-06-23 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> requestFrameAnimation() callback timestamp should be very close to Performance.now()
</span></span></pre></div>
<a id="trunkLayoutTestsfastharnesssnapshotcapturescompositingexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/harness/snapshot-captures-compositing-expected.html (0 => 202404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/harness/snapshot-captures-compositing-expected.html (rev 0)
+++ trunk/LayoutTests/fast/harness/snapshot-captures-compositing-expected.html 2016-06-24 00:08:00 UTC (rev 202404)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .container {
+ position: absolute;
+ top: 200px;
+ left: 100px;
+ }
+ .box {
+ position: relative;
+ left: 110px;
+ height: 400px;
+ width: 300px;
+ background-color: green;
+ transform: translateZ(0);
+ }
+ .clipper {
+ position: absolute;
+ top: 30px;
+ left: 200px;
+ height: 270px;
+ width: 220px;
+ border: 50px solid gray;
+ border-top-width: 230px;
+ border-bottom-width: 260px;
+ }
+ </style>
+</head>
+<body>
+ <div class="container">
+ <div class="box"></div>
+ </div>
+ <div class="clipper"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastharnesssnapshotcapturescompositinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/harness/snapshot-captures-compositing.html (0 => 202404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/harness/snapshot-captures-compositing.html (rev 0)
+++ trunk/LayoutTests/fast/harness/snapshot-captures-compositing.html 2016-06-24 00:08:00 UTC (rev 202404)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .container {
+ position: absolute;
+ top: 200px;
+ left: 100px;
+ perspective: 400px;
+ }
+ .box {
+ height: 400px;
+ width: 400px;
+ background-color: green;
+ transform: rotateY(120deg);
+ }
+ .clipper {
+ position: absolute;
+ top: 30px;
+ left: 200px;
+ height: 270px;
+ width: 220px;
+ border: 50px solid gray;
+ border-top-width: 230px;
+ border-bottom-width: 260px;
+ }
+ </style>
+</head>
+<body>
+ <div class="container">
+ <div class="box"></div>
+ </div>
+ <div class="clipper"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202403 => 202404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-24 00:00:28 UTC (rev 202403)
+++ trunk/Source/WebCore/ChangeLog 2016-06-24 00:08:00 UTC (rev 202404)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-06-23 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS] Make DumpRenderTree and WebKitTestRunner in the simulator use render server snapshotting
+ https://bugs.webkit.org/show_bug.cgi?id=159077
+
+ Reviewed by Tim Horton.
+
+ Add CARenderServer SPIs.
+
+ Test: fast/harness/snapshot-captures-compositing.html
+
+ * platform/spi/cocoa/QuartzCoreSPI.h:
+
</ins><span class="cx"> 2016-06-23 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: add assertions to catch dangling frontends that persist between tests
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaQuartzCoreSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (202403 => 202404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2016-06-24 00:00:28 UTC (rev 202403)
+++ trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2016-06-24 00:08:00 UTC (rev 202404)
</span><span class="lines">@@ -172,6 +172,15 @@
</span><span class="cx"> #if !USE(APPLE_INTERNAL_SDK)
</span><span class="cx"> EXTERN_C void CARenderServerCaptureLayerWithTransform(mach_port_t serverPort, uint32_t clientId, uint64_t layerId,
</span><span class="cx"> uint32_t slotId, int32_t ox, int32_t oy, const CATransform3D *);
</span><ins>+
+EXTERN_C CARenderServerBufferRef CARenderServerCreateBuffer(size_t, size_t);
+EXTERN_C void CARenderServerDestroyBuffer(CARenderServerBufferRef);
+EXTERN_C size_t CARenderServerGetBufferWidth(CARenderServerBufferRef);
+EXTERN_C size_t CARenderServerGetBufferHeight(CARenderServerBufferRef);
+EXTERN_C size_t CARenderServerGetBufferRowBytes(CARenderServerBufferRef);
+EXTERN_C uint8_t* CARenderServerGetBufferData(CARenderServerBufferRef);
+EXTERN_C size_t CARenderServerGetBufferDataSize(CARenderServerBufferRef);
+
</ins><span class="cx"> #if USE(IOSURFACE)
</span><span class="cx"> EXTERN_C void CARenderServerRenderLayerWithTransform(mach_port_t server_port, uint32_t client_id, uint64_t layer_id, IOSurfaceRef iosurface, int32_t ox, int32_t oy, const CATransform3D *matrix);
</span><span class="cx"> EXTERN_C void CARenderServerRenderDisplayLayerWithTransformAndTimeOffset(mach_port_t server_port, CFStringRef display_name, uint32_t client_id, uint64_t layer_id, IOSurfaceRef iosurface, int32_t ox, int32_t oy, const CATransform3D *matrix, CFTimeInterval offset);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (202403 => 202404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-06-24 00:00:28 UTC (rev 202403)
+++ trunk/Tools/ChangeLog 2016-06-24 00:08:00 UTC (rev 202404)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-06-23 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS] Make DumpRenderTree and WebKitTestRunner in the simulator use render server snapshotting
+ https://bugs.webkit.org/show_bug.cgi?id=159077
+
+ Reviewed by Tim Horton.
+
+ Fix both DRT and WTR for iOS to use CARenderServerRenderLayerWithTransform() on the view's layer.
+ This allows them to capture compositing layers in snapshots, rather than doing a software paint,
+ thus enabling testing of more things.
+
+ * DumpRenderTree/cg/PixelDumpSupportCG.cpp:
+ (createBitmapContext): Moved to this file to share it.
+ * DumpRenderTree/cg/PixelDumpSupportCG.h:
+ * DumpRenderTree/ios/PixelDumpSupportIOS.mm:
+ (createBitmapContextFromWebView):
+ (BitmapContext::createFromUIImage): Deleted.
+ (BitmapContext::pixelData): Deleted.
+ (BitmapContext::BitmapContext): Deleted.
+ (computeMD5HashStringForBitmapContext): Deleted.
+ (dumpBitmap): Deleted.
+ * DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig: Don't exclude PixelDumpSupportCG.cpp.
+ * DumpRenderTree/mac/PixelDumpSupportMac.mm:
+ (createPagedBitmapContext):
+ (createBitmapContext): Deleted.
+ * WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig: link with QuartzCore.
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::dump): Deleted.
+ * WebKitTestRunner/ios/PlatformWebViewIOS.mm:
+ (WTR::PlatformWebView::windowSnapshotImage):
+
</ins><span class="cx"> 2016-06-23 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> [jhbuild] Added libxslt module.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreecgPixelDumpSupportCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp (202403 => 202404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp 2016-06-24 00:00:28 UTC (rev 202403)
+++ trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp 2016-06-24 00:08:00 UTC (rev 202404)
</span><span class="lines">@@ -115,3 +115,27 @@
</span><span class="cx"> RetainPtr<CGImageRef> image = adoptCF(CGBitmapContextCreateImage(context->cgContext()));
</span><span class="cx"> printPNG(image.get(), checksum);
</span><span class="cx"> }
</span><ins>+
+PassRefPtr<BitmapContext> createBitmapContext(size_t pixelsWide, size_t pixelsHigh, size_t& rowBytes, void*& buffer)
+{
+ rowBytes = (4 * pixelsWide + 63) & ~63; // Use a multiple of 64 bytes to improve CG performance
+
+ buffer = calloc(pixelsHigh, rowBytes);
+ if (!buffer) {
+ WTFLogAlways("DumpRenderTree: calloc(%zu, %zu) failed\n", pixelsHigh, rowBytes);
+ return nullptr;
+ }
+
+ // Creating this bitmap in the device color space prevents any color conversion when the image of the web view is drawn into it.
+ RetainPtr<CGColorSpaceRef> colorSpace = adoptCF(CGColorSpaceCreateDeviceRGB());
+ CGContextRef context = CGBitmapContextCreate(buffer, pixelsWide, pixelsHigh, 8, rowBytes, colorSpace.get(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host);
+ if (!context) {
+ WTFLogAlways("DumpRenderTree: CGBitmapContextCreate(%p, %zu, %zu, 8, %zu, %p, 0x%x) failed\n", buffer, pixelsHigh, pixelsWide, rowBytes, colorSpace.get(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host);
+ free(buffer);
+ buffer = nullptr;
+ return nullptr;
+ }
+
+ return BitmapContext::createByAdoptingBitmapAndContext(buffer, context);
+}
+
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreecgPixelDumpSupportCGh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.h (202403 => 202404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.h 2016-06-24 00:00:28 UTC (rev 202403)
+++ trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.h 2016-06-24 00:08:00 UTC (rev 202404)
</span><span class="lines">@@ -79,6 +79,7 @@
</span><span class="cx">
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+PassRefPtr<BitmapContext> createBitmapContext(size_t pixelsWide, size_t pixelsHigh, size_t& rowBytes, void*& buffer);
</ins><span class="cx"> PassRefPtr<BitmapContext> createBitmapContextFromWebView(bool onscreen, bool incrementalRepaint, bool sweepHorizontally, bool drawSelectionRect);
</span><span class="cx">
</span><span class="cx"> #endif // PixelDumpSupportCG_h
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosPixelDumpSupportIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm (202403 => 202404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm 2016-06-24 00:00:28 UTC (rev 202403)
+++ trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm 2016-06-24 00:08:00 UTC (rev 202404)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #import "DumpRenderTree.h"
</span><span class="cx"> #import "DumpRenderTreeWindow.h"
</span><ins>+#import "PixelDumpSupportCG.h"
</ins><span class="cx"> #import "UIKitSPI.h"
</span><span class="cx">
</span><span class="cx"> #define COMMON_DIGEST_FOR_OPENSSL
</span><span class="lines">@@ -37,7 +38,9 @@
</span><span class="cx"> #import <CommonCrypto/CommonDigest.h>
</span><span class="cx"> #import <MobileCoreServices/UTCoreTypes.h>
</span><span class="cx"> #import <QuartzCore/QuartzCore.h>
</span><ins>+#import <WebCore/QuartzCoreSPI.h>
</ins><span class="cx"> #import <WebKit/WebCoreThread.h>
</span><ins>+#import <wtf/BlockObjCExceptions.h>
</ins><span class="cx"> #import <wtf/RefCounted.h>
</span><span class="cx"> #import <wtf/RefPtr.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="lines">@@ -45,49 +48,49 @@
</span><span class="cx"> extern DumpRenderTreeWindow *gDrtWindow;
</span><span class="cx"> extern UIWebBrowserView *gWebBrowserView;
</span><span class="cx">
</span><del>-class BitmapContext : public RefCounted<BitmapContext> {
-public:
- static PassRefPtr<BitmapContext> createFromUIImage(UIImage *image)
- {
- return adoptRef(new BitmapContext(image));
- }
</del><ins>+PassRefPtr<BitmapContext> createBitmapContextFromWebView(bool onscreen, bool incrementalRepaint, bool sweepHorizontally, bool drawSelectionRect)
+{
+ // TODO: <rdar://problem/6558366> DumpRenderTree: Investigate testRepaintSweepHorizontally and dumpSelectionRect
+ BEGIN_BLOCK_OBJC_EXCEPTIONS;
</ins><span class="cx">
</span><del>- NSData *pixelData() const { return m_pixelData.get(); }
</del><ins>+ WebThreadLock();
+ [CATransaction flush];
</ins><span class="cx">
</span><del>-private:
- BitmapContext(UIImage *image)
- : m_pixelData(UIImagePNGRepresentation(image))
- {
</del><ins>+ CGFloat deviceScaleFactor = 2; // FIXME: hardcode 2x for now. In future we could respect 1x and 3x as we do on Mac.
+ CATransform3D transform = CATransform3DMakeScale(deviceScaleFactor, deviceScaleFactor, 1);
+
+ CGSize viewSize = [[mainFrame webView] frame].size;
+ int bufferWidth = ceil(viewSize.width * deviceScaleFactor);
+ int bufferHeight = ceil(viewSize.height * deviceScaleFactor);
+
+ CARenderServerBufferRef buffer = CARenderServerCreateBuffer(bufferWidth, bufferHeight);
+ if (!buffer) {
+ WTFLogAlways("CARenderServerCreateBuffer failed for buffer with width %d height %d\n", bufferWidth, bufferHeight);
+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- RetainPtr<NSData> m_pixelData;
-};
</del><ins>+ CARenderServerRenderLayerWithTransform(MACH_PORT_NULL, [gWebBrowserView layer].context.contextId, reinterpret_cast<uint64_t>([gWebBrowserView layer]), buffer, 0, 0, &transform);
</ins><span class="cx">
</span><del>-void computeMD5HashStringForBitmapContext(BitmapContext* context, char hashString[33])
-{
- 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]);
-}
</del><ins>+ uint8_t* data = CARenderServerGetBufferData(buffer);
+ size_t rowBytes = CARenderServerGetBufferRowBytes(buffer);
</ins><span class="cx">
</span><del>-void dumpBitmap(BitmapContext* context, const char* checksum)
-{
- printPNG(static_cast<const unsigned char*>([context->pixelData() bytes]), [context->pixelData() length], checksum);
-}
</del><ins>+ static CGColorSpaceRef sRGBSpace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
+ RetainPtr<CGDataProviderRef> provider = adoptCF(CGDataProviderCreateWithData(0, data, CARenderServerGetBufferDataSize(buffer), nullptr));
+
+ RetainPtr<CGImageRef> cgImage = adoptCF(CGImageCreate(bufferWidth, bufferHeight, 8, 32, rowBytes, sRGBSpace, kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host, provider.get(), 0, false, kCGRenderingIntentDefault));
</ins><span class="cx">
</span><del>-PassRefPtr<BitmapContext> createBitmapContextFromWebView(bool onscreen, bool incrementalRepaint, bool sweepHorizontally, bool drawSelectionRect)
-{
- // TODO: <rdar://problem/6558366> DumpRenderTree: Investigate testRepaintSweepHorizontally and dumpSelectionRect
</del><ins>+ void* bitmapBuffer = nullptr;
+ size_t bitmapRowBytes = 0;
+ auto bitmapContext = createBitmapContext(bufferWidth, bufferHeight, bitmapRowBytes, bitmapBuffer);
+ if (!bitmapContext) {
+ CARenderServerDestroyBuffer(buffer);
+ return nullptr;
+ }
</ins><span class="cx">
</span><del>- WebThreadLock();
- [CATransaction flush];
</del><ins>+ CGContextDrawImage(bitmapContext->cgContext(), CGRectMake(0, 0, bufferWidth, bufferHeight), cgImage.get());
+ CARenderServerDestroyBuffer(buffer);
</ins><span class="cx">
</span><del>- UIGraphicsBeginImageContextWithOptions([[mainFrame webView] frame].size, YES /* opaque */, [gDrtWindow screenScale]);
- [[gWebBrowserView layer] renderInContext:UIGraphicsGetCurrentContext()];
- RefPtr<BitmapContext> context = BitmapContext::createFromUIImage(UIGraphicsGetImageFromCurrentImageContext());
- UIGraphicsEndImageContext();
</del><ins>+ return bitmapContext;
</ins><span class="cx">
</span><del>- return context.release();
</del><ins>+ END_BLOCK_OBJC_EXCEPTIONS;
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacConfigurationsDumpRenderTreeLibraryxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig (202403 => 202404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig 2016-06-24 00:00:28 UTC (rev 202403)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig 2016-06-24 00:08:00 UTC (rev 202404)
</span><span class="lines">@@ -30,5 +30,5 @@
</span><span class="cx">
</span><span class="cx"> OTHER_LDFLAGS = ;
</span><span class="cx">
</span><del>-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = AccessibilityControllerMac.mm AccessibilityUIElementMac.mm DumpRenderTreeFileDraggingSource.m PixelDumpSupportMac.mm PixelDumpSupportCG.cpp;
</del><ins>+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = AccessibilityControllerMac.mm AccessibilityUIElementMac.mm DumpRenderTreeFileDraggingSource.m PixelDumpSupportMac.mm;
</ins><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = AccessibilityUIElementIOS.mm AccessibilityControllerIOS.mm PixelDumpSupportIOS.mm DumpRenderTreeBrowserView.mm;
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacPixelDumpSupportMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm (202403 => 202404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm 2016-06-24 00:00:28 UTC (rev 202403)
+++ trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm 2016-06-24 00:08:00 UTC (rev 202404)
</span><span class="lines">@@ -49,29 +49,6 @@
</span><span class="cx"> + (void)synchronize;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-static PassRefPtr<BitmapContext> createBitmapContext(size_t pixelsWide, size_t pixelsHigh, size_t& rowBytes, void*& buffer)
-{
- rowBytes = (4 * pixelsWide + 63) & ~63; // Use a multiple of 64 bytes to improve CG performance
-
- buffer = calloc(pixelsHigh, rowBytes);
- if (!buffer) {
- WTFLogAlways("DumpRenderTree: calloc(%llu, %llu) failed\n", pixelsHigh, rowBytes);
- return nullptr;
- }
-
- // Creating this bitmap in the device color space prevents any color conversion when the image of the web view is drawn into it.
- RetainPtr<CGColorSpaceRef> colorSpace = adoptCF(CGColorSpaceCreateDeviceRGB());
- CGContextRef context = CGBitmapContextCreate(buffer, pixelsWide, pixelsHigh, 8, rowBytes, colorSpace.get(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host); // Use ARGB8 on PPC or BGRA8 on X86 to improve CG performance
- if (!context) {
- WTFLogAlways("DumpRenderTree: CGBitmapContextCreate(%p, %llu, %llu, 8, %llu, %p, 0x%x) failed\n", buffer, pixelsHigh, pixelsWide, rowBytes, colorSpace.get(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host);
- free(buffer);
- buffer = nullptr;
- return nullptr;
- }
-
- return BitmapContext::createByAdoptingBitmapAndContext(buffer, context);
-}
-
</del><span class="cx"> static void paintRepaintRectOverlay(WebView* webView, CGContextRef context)
</span><span class="cx"> {
</span><span class="cx"> CGRect viewRect = NSRectToCGRect([webView bounds]);
</span><span class="lines">@@ -203,7 +180,7 @@
</span><span class="cx"> int pageHeightInPixels = TestRunner::viewHeight;
</span><span class="cx"> int numberOfPages = [mainFrame numberOfPagesWithPageWidth:pageWidthInPixels pageHeight:pageHeightInPixels];
</span><span class="cx"> size_t rowBytes = 0;
</span><del>- void* buffer = 0;
</del><ins>+ void* buffer = nullptr;
</ins><span class="cx">
</span><span class="cx"> int totalHeight = numberOfPages * (pageHeightInPixels + 1) - 1;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerConfigurationsWebKitTestRunnerAppxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig (202403 => 202404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig 2016-06-24 00:00:28 UTC (rev 202403)
+++ trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig 2016-06-24 00:08:00 UTC (rev 202404)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx"> PRODUCT_NAME = WebKitTestRunner;
</span><span class="cx"> GCC_ENABLE_OBJC_EXCEPTIONS = YES;
</span><del>-OTHER_LDFLAGS = $(inherited) -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebKitTestRunner -framework JavaScriptCore -framework CoreGraphics -framework ImageIO -framework IOKit -framework UIKit -framework WebKit -framework Foundation;
</del><ins>+OTHER_LDFLAGS = $(inherited) -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebKitTestRunner -framework JavaScriptCore -framework CoreGraphics -framework QuartzCore -framework ImageIO -framework IOKit -framework UIKit -framework WebKit -framework Foundation;
</ins><span class="cx"> SKIP_INSTALL[sdk=macosx*] = YES;
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = ios/* AppDelegate.m;
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES[sdk=appletv*] = ios/Launch.storyboard;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (202403 => 202404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2016-06-24 00:00:28 UTC (rev 202403)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2016-06-24 00:08:00 UTC (rev 202404)
</span><span class="lines">@@ -895,12 +895,7 @@
</span><span class="cx"> injectedBundle.dumpBackForwardListsForAllPages(stringBuilder);
</span><span class="cx">
</span><span class="cx"> if (injectedBundle.shouldDumpPixels() && injectedBundle.testRunner()->shouldDumpPixels()) {
</span><del>-#if PLATFORM(IOS)
- // IOS doesn't implement PlatformWebView::windowSnapshotImage() yet, so we need to generate the snapshot in the web process.
- bool shouldCreateSnapshot = true;
-#else
</del><span class="cx"> bool shouldCreateSnapshot = injectedBundle.testRunner()->isPrinting();
</span><del>-#endif
</del><span class="cx"> if (shouldCreateSnapshot) {
</span><span class="cx"> WKSnapshotOptions options = kWKSnapshotOptionsShareable;
</span><span class="cx"> WKRect snapshotRect = WKBundleFrameGetVisibleContentBounds(WKBundlePageGetMainFrame(m_page));
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunneriosPlatformWebViewIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm (202403 => 202404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm 2016-06-24 00:00:28 UTC (rev 202403)
+++ trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm 2016-06-24 00:08:00 UTC (rev 202404)
</span><span class="lines">@@ -28,10 +28,12 @@
</span><span class="cx">
</span><span class="cx"> #import "TestController.h"
</span><span class="cx"> #import "TestRunnerWKWebView.h"
</span><ins>+#import <WebCore/QuartzCoreSPI.h>
</ins><span class="cx"> #import <WebKit/WKImageCG.h>
</span><span class="cx"> #import <WebKit/WKPreferencesPrivate.h>
</span><span class="cx"> #import <WebKit/WKWebViewConfiguration.h>
</span><span class="cx"> #import <WebKit/WKWebViewPrivate.h>
</span><ins>+#import <wtf/BlockObjCExceptions.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> @interface WKWebView (Details)
</span><span class="lines">@@ -94,12 +96,6 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@interface UIWindow ()
-
-- (void)_setWindowResolution:(CGFloat)resolution displayIfChanged:(BOOL)displayIfChanged;
-
-@end
-
</del><span class="cx"> namespace WTR {
</span><span class="cx">
</span><span class="cx"> PlatformWebView::PlatformWebView(WKWebViewConfiguration* configuration, const TestOptions& options)
</span><span class="lines">@@ -206,8 +202,36 @@
</span><span class="cx">
</span><span class="cx"> WKRetainPtr<WKImageRef> PlatformWebView::windowSnapshotImage()
</span><span class="cx"> {
</span><del>- // FIXME: Need an implementation of this, or we're depending on software paints!
- return nullptr;
</del><ins>+ BEGIN_BLOCK_OBJC_EXCEPTIONS;
+
+ CGFloat deviceScaleFactor = 2; // FIXME: hardcode 2x for now. In future we could respect 1x and 3x as we do on Mac.
+ CATransform3D transform = CATransform3DMakeScale(deviceScaleFactor, deviceScaleFactor, 1);
+
+ CGSize viewSize = m_view.bounds.size;
+ int bufferWidth = ceil(viewSize.width * deviceScaleFactor);
+ int bufferHeight = ceil(viewSize.height * deviceScaleFactor);
+
+ CARenderServerBufferRef buffer = CARenderServerCreateBuffer(bufferWidth, bufferHeight);
+ if (!buffer) {
+ WTFLogAlways("CARenderServerCreateBuffer failed for buffer with width %d height %d\n", bufferWidth, bufferHeight);
+ return nullptr;
+ }
+
+ CARenderServerRenderLayerWithTransform(MACH_PORT_NULL, m_view.layer.context.contextId, reinterpret_cast<uint64_t>(m_view.layer), buffer, 0, 0, &transform);
+
+ uint8_t* data = CARenderServerGetBufferData(buffer);
+ size_t rowBytes = CARenderServerGetBufferRowBytes(buffer);
+
+ static CGColorSpaceRef sRGBSpace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
+ RetainPtr<CGDataProviderRef> provider = adoptCF(CGDataProviderCreateWithData(0, data, CARenderServerGetBufferDataSize(buffer), nullptr));
+
+ RetainPtr<CGImageRef> cgImage = adoptCF(CGImageCreate(bufferWidth, bufferHeight, 8, 32, rowBytes, sRGBSpace, kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host, provider.get(), 0, false, kCGRenderingIntentDefault));
+ WKRetainPtr<WKImageRef> result = adoptWK(WKImageCreateFromCGImage(cgImage.get(), 0));
+
+ CARenderServerDestroyBuffer(buffer);
+
+ return result;
+ END_BLOCK_OBJC_EXCEPTIONS;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool PlatformWebView::viewSupportsOptions(const TestOptions& options) const
</span></span></pre>
</div>
</div>
</body>
</html>