Title: [202411] trunk/Tools
- Revision
- 202411
- Author
- simon.fra...@apple.com
- Date
- 2016-06-23 19:50:59 -0700 (Thu, 23 Jun 2016)
Log Message
Fix hardware builds, where USE(IOSURFACE) is true by #ifdeffing.
* DumpRenderTree/ios/PixelDumpSupportIOS.mm:
(createBitmapContextFromWebView):
* WebKitTestRunner/ios/PlatformWebViewIOS.mm:
(WTR::PlatformWebView::windowSnapshotImage):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (202410 => 202411)
--- trunk/Tools/ChangeLog 2016-06-24 02:47:19 UTC (rev 202410)
+++ trunk/Tools/ChangeLog 2016-06-24 02:50:59 UTC (rev 202411)
@@ -1,5 +1,14 @@
2016-06-23 Simon Fraser <simon.fra...@apple.com>
+ Fix hardware builds, where USE(IOSURFACE) is true by #ifdeffing.
+
+ * DumpRenderTree/ios/PixelDumpSupportIOS.mm:
+ (createBitmapContextFromWebView):
+ * WebKitTestRunner/ios/PlatformWebViewIOS.mm:
+ (WTR::PlatformWebView::windowSnapshotImage):
+
+2016-06-23 Simon Fraser <simon.fra...@apple.com>
+
[iOS] Make DumpRenderTree and WebKitTestRunner in the simulator use render server snapshotting
https://bugs.webkit.org/show_bug.cgi?id=159077
Modified: trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm (202410 => 202411)
--- trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm 2016-06-24 02:47:19 UTC (rev 202410)
+++ trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm 2016-06-24 02:50:59 UTC (rev 202411)
@@ -56,6 +56,9 @@
WebThreadLock();
[CATransaction flush];
+#if USE(IOSURFACE)
+ return nullptr;
+#else
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);
@@ -91,6 +94,7 @@
CARenderServerDestroyBuffer(buffer);
return bitmapContext;
+#endif
END_BLOCK_OBJC_EXCEPTIONS;
}
Modified: trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm (202410 => 202411)
--- trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm 2016-06-24 02:47:19 UTC (rev 202410)
+++ trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm 2016-06-24 02:50:59 UTC (rev 202411)
@@ -203,7 +203,9 @@
WKRetainPtr<WKImageRef> PlatformWebView::windowSnapshotImage()
{
BEGIN_BLOCK_OBJC_EXCEPTIONS;
-
+#if USE(IOSURFACE)
+ return nullptr;
+#else
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);
@@ -231,6 +233,7 @@
CARenderServerDestroyBuffer(buffer);
return result;
+#endif
END_BLOCK_OBJC_EXCEPTIONS;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
