Title: [176872] trunk/Tools
- Revision
- 176872
- Author
- [email protected]
- Date
- 2014-12-05 14:13:18 -0800 (Fri, 05 Dec 2014)
Log Message
[iOS] DumpRenderTree fails to render every other test when pixel tests are on
https://bugs.webkit.org/show_bug.cgi?id=137581
<rdar://problem/18642906>
Reviewed by Simon Fraser.
Fixes an issue where the DumpRenderTree snapshot may reflect the rendered content
of the test that proceeded the currently running test.
* DumpRenderTree/ios/PixelDumpSupportIOS.mm:
(dumpWebViewAsPixelsAndCompareWithExpected): Ensure that UIKit has performed a layout
of the UIWebBrowserView view. Also, remove unnecessary call to -[UIWebDocumentView layoutTilesNow]
as -[UIWebDocumentView newSnapshotWithRect] will layout the tiles.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (176871 => 176872)
--- trunk/Tools/ChangeLog 2014-12-05 22:11:53 UTC (rev 176871)
+++ trunk/Tools/ChangeLog 2014-12-05 22:13:18 UTC (rev 176872)
@@ -1,3 +1,19 @@
+2014-12-05 Daniel Bates <[email protected]>
+
+ [iOS] DumpRenderTree fails to render every other test when pixel tests are on
+ https://bugs.webkit.org/show_bug.cgi?id=137581
+ <rdar://problem/18642906>
+
+ Reviewed by Simon Fraser.
+
+ Fixes an issue where the DumpRenderTree snapshot may reflect the rendered content
+ of the test that proceeded the currently running test.
+
+ * DumpRenderTree/ios/PixelDumpSupportIOS.mm:
+ (dumpWebViewAsPixelsAndCompareWithExpected): Ensure that UIKit has performed a layout
+ of the UIWebBrowserView view. Also, remove unnecessary call to -[UIWebDocumentView layoutTilesNow]
+ as -[UIWebDocumentView newSnapshotWithRect] will layout the tiles.
+
2014-12-05 Jer Noble <[email protected]>
[WTF] MediaTime should support round-tripping from and to doubles.
Modified: trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm (176871 => 176872)
--- trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm 2014-12-05 22:11:53 UTC (rev 176871)
+++ trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm 2014-12-05 22:13:18 UTC (rev 176872)
@@ -55,11 +55,9 @@
void dumpWebViewAsPixelsAndCompareWithExpected(const std::string& expectedHash)
{
// TODO: <rdar://problem/6558366> DumpRenderTree: Investigate testRepaintSweepHorizontally and dumpSelectionRect
-
- // Take snapshot
WebThreadLock();
+ [gWebBrowserView layoutIfNeeded]; // Re-enables tile painting, which was disabled when committing the frame load.
[gWebBrowserView setNeedsDisplay];
- [gWebBrowserView layoutTilesNow];
RetainPtr<CGImageRef> snapshot = adoptCF([gWebBrowserView newSnapshotWithRect:[[mainFrame webView] frame]]);
NSData *pngData = UIImagePNGRepresentation([UIImage imageWithCGImage:snapshot.get()]);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
