Title: [98032] trunk/LayoutTests
- Revision
- 98032
- Author
- simon.fra...@apple.com
- Date
- 2011-10-20 15:52:45 -0700 (Thu, 20 Oct 2011)
Log Message
Fix two compositing iframes tests
https://bugs.webkit.org/show_bug.cgi?id=70543
Reviewed by Dean Jackson.
Remove incorrect WK2-specific result for invisible-nested-iframe-show.html.
The WK1 result for overlapped-iframe-iframe-expected.txt was also incorrect, because
the test didn not function correctly in WK1. It needs to use a setTimeout(0) to work
around an AppKit issue, and to display() so that painting triggers overflow detection.
* compositing/iframes/overlapped-iframe-iframe.html:
* platform/mac-wk2/compositing/iframes/invisible-nested-iframe-show-expected.txt: Removed.
* platform/mac/compositing/iframes/overlapped-iframe-iframe-expected.txt: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (98031 => 98032)
--- trunk/LayoutTests/ChangeLog 2011-10-20 22:48:13 UTC (rev 98031)
+++ trunk/LayoutTests/ChangeLog 2011-10-20 22:52:45 UTC (rev 98032)
@@ -1,3 +1,20 @@
+2011-10-20 Simon Fraser <simon.fra...@apple.com>
+
+ Fix two compositing iframes tests
+ https://bugs.webkit.org/show_bug.cgi?id=70543
+
+ Reviewed by Dean Jackson.
+
+ Remove incorrect WK2-specific result for invisible-nested-iframe-show.html.
+
+ The WK1 result for overlapped-iframe-iframe-expected.txt was also incorrect, because
+ the test didn not function correctly in WK1. It needs to use a setTimeout(0) to work
+ around an AppKit issue, and to display() so that painting triggers overflow detection.
+
+ * compositing/iframes/overlapped-iframe-iframe.html:
+ * platform/mac-wk2/compositing/iframes/invisible-nested-iframe-show-expected.txt: Removed.
+ * platform/mac/compositing/iframes/overlapped-iframe-iframe-expected.txt: Removed.
+
2011-10-19 Ryosuke Niwa <rn...@webkit.org>
[nrwt] results.html should differentiate expected missing and unexpected missing
Modified: trunk/LayoutTests/compositing/iframes/overlapped-iframe-iframe.html (98031 => 98032)
--- trunk/LayoutTests/compositing/iframes/overlapped-iframe-iframe.html 2011-10-20 22:48:13 UTC (rev 98031)
+++ trunk/LayoutTests/compositing/iframes/overlapped-iframe-iframe.html 2011-10-20 22:52:45 UTC (rev 98032)
@@ -25,14 +25,21 @@
</style>
<script>
if (window.layoutTestController) {
+ layoutTestController.waitUntilDone();
layoutTestController.dumpAsText();
}
function doTest()
{
- if (window.layoutTestController) {
- document.getElementById('layers').innerHTML = layoutTestController.layerTreeAsText();
- }
+ // For some reason this delay is required for AppKit to not short-circuit the display which is required
+ // for overlap testing to kick in.
+ window.setTimeout(function() {
+ if (window.layoutTestController) {
+ layoutTestController.display();
+ document.getElementById('layers').innerHTML = layoutTestController.layerTreeAsText();
+ layoutTestController.notifyDone();
+ }
+ }, 0);
}
window.addEventListener('load', doTest, false);
Deleted: trunk/LayoutTests/platform/mac/compositing/iframes/overlapped-iframe-iframe-expected.txt (98031 => 98032)
--- trunk/LayoutTests/platform/mac/compositing/iframes/overlapped-iframe-iframe-expected.txt 2011-10-20 22:48:13 UTC (rev 98031)
+++ trunk/LayoutTests/platform/mac/compositing/iframes/overlapped-iframe-iframe-expected.txt 2011-10-20 22:52:45 UTC (rev 98032)
@@ -1 +0,0 @@
-
Deleted: trunk/LayoutTests/platform/mac-wk2/compositing/iframes/invisible-nested-iframe-show-expected.txt (98031 => 98032)
--- trunk/LayoutTests/platform/mac-wk2/compositing/iframes/invisible-nested-iframe-show-expected.txt 2011-10-20 22:48:13 UTC (rev 98031)
+++ trunk/LayoutTests/platform/mac-wk2/compositing/iframes/invisible-nested-iframe-show-expected.txt 2011-10-20 22:52:45 UTC (rev 98032)
@@ -1,19 +0,0 @@
-
-(GraphicsLayer
- (bounds 800.00 600.00)
- (children 1
- (GraphicsLayer
- (position -12.00 -12.00)
- (bounds 812.00 612.00)
- (children 1
- (GraphicsLayer
- (position 30.00 214.00)
- (bounds 210.00 210.00)
- (drawsContent 1)
- (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
- )
- )
- )
- )
-)
-
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
