2011-02-09 Yael Aharon <yael.aharon@nokia.com>
authoryael.aharon@nokia.com <yael.aharon@nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 9 Feb 2011 19:06:20 +0000 (19:06 +0000)
committeryael.aharon@nokia.com <yael.aharon@nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 9 Feb 2011 19:06:20 +0000 (19:06 +0000)
        Reviewed by Martin Robinson.

        frames/flattening/iframe-flattening-crash.html fails on GTK.
        https://bugs.webkit.org/show_bug.cgi?id=54106

        Modify the test to be more consistent with other frame flattening tests.

        * fast/frames/flattening/iframe-flattening-crash.html:
        * fast/frames/flattening/resources/iframe-flattening-crash.html: Removed.
        * platform/gtk/Skipped:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@78085 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/fast/frames/flattening/iframe-flattening-crash.html
LayoutTests/fast/frames/flattening/resources/iframe-flattening-crash.html [deleted file]
LayoutTests/platform/gtk/Skipped

index 75f415d..7cc75dd 100644 (file)
@@ -1,3 +1,16 @@
+2011-02-09  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Martin Robinson.
+
+        frames/flattening/iframe-flattening-crash.html fails on GTK.
+        https://bugs.webkit.org/show_bug.cgi?id=54106
+
+        Modify the test to be more consistent with other frame flattening tests.
+
+        * fast/frames/flattening/iframe-flattening-crash.html:
+        * fast/frames/flattening/resources/iframe-flattening-crash.html: Removed.
+        * platform/gtk/Skipped:
+
 2011-02-09  Brian Weinstein  <bweinstein@apple.com>
 
         Add failing Windows expected results for tests that were added recently and have failed since
index 96e60e9..a5ef122 100644 (file)
@@ -1,22 +1,36 @@
-<!DOCTYPE html>
-<html >
+<html>
 <head>
-<style>
-#My { background-color: blue; width: 100px; height: 100px; }
-</style>
-<script type="text/javascript">
-function runTest()
-{
-    if (window.layoutTestController) {
-        layoutTestController.setFrameFlatteningEnabled(true);
-        layoutTestController.dumpAsText();
-        layoutTestController.waitUntilDone();
-    }
-}
-</script>
+    <script type="text/javascript">
+        function test()
+        {
+            if (window.layoutTestController) {
+                layoutTestController.dumpAsText();
+                layoutTestController.waitUntilDone();
+                layoutTestController.setFrameFlatteningEnabled(true);
+            }
+        }
+
+    </script>
 </head>
-<body onload="runTest();">
-<p>This test passes if it does not crash <a href="https://bugs.webkit.org/show_bug.cgi?id=52449">https://bugs.webkit.org/show_bug.cgi?id=52449</a></p>
-<iframe id="My" src="resources/iframe-flattening-crash.html"></iframe>
-</body></html>
+<body onload="test()">
+    <style>body { background-color: green; }</style>
+    <p>This test passes if it does not crash <a href="https://bugs.webkit.org/show_bug.cgi?id=52449">https://bugs.webkit.org/show_bug.cgi?id=52449</a></p>
+
+    <p><iframe id="if"  width="20%" height="20%" scrolling=auto src="data:text/html,
+    <html>
+    <script>
+        function test2(){
+            var i = document.getElementsByTagName('html')[0].clientWidth; 
+            if (window.layoutTestController)
+                layoutTestController.notifyDone();
+            if (window.layoutTestController)
+                layoutTestController.setFrameFlatteningEnabled(true);
+        }
+    </script>
+    <body onresize='test2();'>
+    <div style='position: absolute; width: 400px; height: 400px; left: 0; top: 0px;' id='p'><input id='in' value='abcd'></div>
+    </body></html>
+    ">
+</body>
+</html>
 
diff --git a/LayoutTests/fast/frames/flattening/resources/iframe-flattening-crash.html b/LayoutTests/fast/frames/flattening/resources/iframe-flattening-crash.html
deleted file mode 100644 (file)
index 7da3ec7..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<script>
-function res() { 
-    var i = document.getElementsByTagName('html')[0].clientWidth; 
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
-}
-</script>
-<style>
-#p { border: 4px solid red;}
-</style>
-<body onresize="res();">
-<div id='p'><br><br><br><br><br><br><br><br><br></div> 
-</body></html>
-
index 00ff08d..acbcc4a 100644 (file)
@@ -4221,6 +4221,3 @@ http/tests/websocket/tests/cross-origin.html
 # https://bugs.webkit.org/show_bug.cgi?id=54073
 plugins/invalidate_rect.html
 
-# This test was introduced in http://trac.webkit.org/changeset/77988. It seems
-# that onresize never fires on the interior frame, so the test times out.
-fast/frames/flattening/iframe-flattening-crash.html