Title: [120894] trunk/LayoutTests
Revision
120894
Author
[email protected]
Date
2012-06-20 18:29:36 -0700 (Wed, 20 Jun 2012)

Log Message

Unskip fast/hidpi/device-scale-factor-paint.html
https://bugs.webkit.org/show_bug.cgi?id=89618

Reviewed by Beth Dakin.

Now that this test doesn't cause WebKit2 to crash, we can unskip it.

* fast/hidpi/device-scale-factor-paint-expected.html: Removed.
    - Previously, this test was a reftest, but the reference also tried
      to set the device scale factor, which seems problematic. This
      patch converts the test to a normal image test. There aren't any
      scrollbars or text, so many platforms should be able to use the
      same expected PNG file.
* fast/hidpi/device-scale-factor-paint.html:
    - Wrap the call to notifyDone in a thunk because it doesn't work otherwise.
* platform/mac/Skipped:
* platform/mac/fast/hidpi/device-scale-factor-paint-expected.png: Added.
* platform/mac/fast/hidpi/device-scale-factor-paint-expected.txt: Added.
* platform/wk2/Skipped:

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (120893 => 120894)


--- trunk/LayoutTests/ChangeLog	2012-06-21 01:13:56 UTC (rev 120893)
+++ trunk/LayoutTests/ChangeLog	2012-06-21 01:29:36 UTC (rev 120894)
@@ -1,3 +1,25 @@
+2012-06-20  Adam Barth  <[email protected]>
+
+        Unskip fast/hidpi/device-scale-factor-paint.html
+        https://bugs.webkit.org/show_bug.cgi?id=89618
+
+        Reviewed by Beth Dakin.
+
+        Now that this test doesn't cause WebKit2 to crash, we can unskip it.
+
+        * fast/hidpi/device-scale-factor-paint-expected.html: Removed.
+            - Previously, this test was a reftest, but the reference also tried
+              to set the device scale factor, which seems problematic. This
+              patch converts the test to a normal image test. There aren't any
+              scrollbars or text, so many platforms should be able to use the
+              same expected PNG file.
+        * fast/hidpi/device-scale-factor-paint.html:
+            - Wrap the call to notifyDone in a thunk because it doesn't work otherwise.
+        * platform/mac/Skipped:
+        * platform/mac/fast/hidpi/device-scale-factor-paint-expected.png: Added.
+        * platform/mac/fast/hidpi/device-scale-factor-paint-expected.txt: Added.
+        * platform/wk2/Skipped:
+
 2012-06-20  Joshua Bell  <[email protected]>
 
         IndexedDB: Remove redundant IDBObjectStore.delete() overloads

Deleted: trunk/LayoutTests/fast/hidpi/device-scale-factor-paint-expected.html (120893 => 120894)


--- trunk/LayoutTests/fast/hidpi/device-scale-factor-paint-expected.html	2012-06-21 01:13:56 UTC (rev 120893)
+++ trunk/LayoutTests/fast/hidpi/device-scale-factor-paint-expected.html	2012-06-21 01:29:36 UTC (rev 120894)
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script>
-if (window.internals)
-    internals.settings.setDeviceScaleFactor(1);
-</script>
-<body>
-<div style='position: absolute; left: 10px; top: 20px; width: 100px; height: 100px; background-color: green'>
-</div>
-</body>
-</html>

Modified: trunk/LayoutTests/fast/hidpi/device-scale-factor-paint.html (120893 => 120894)


--- trunk/LayoutTests/fast/hidpi/device-scale-factor-paint.html	2012-06-21 01:13:56 UTC (rev 120893)
+++ trunk/LayoutTests/fast/hidpi/device-scale-factor-paint.html	2012-06-21 01:29:36 UTC (rev 120894)
@@ -9,7 +9,7 @@
     }
     
     function finishTest() {
-        setTimeout(layoutTestController.notifyDone, 0);
+        setTimeout(function() { layoutTestController.notifyDone() }, 0);
     }
 </script>
 </head>

Modified: trunk/LayoutTests/platform/mac/Skipped (120893 => 120894)


--- trunk/LayoutTests/platform/mac/Skipped	2012-06-21 01:13:56 UTC (rev 120893)
+++ trunk/LayoutTests/platform/mac/Skipped	2012-06-21 01:29:36 UTC (rev 120894)
@@ -884,10 +884,6 @@
 # https://bugs.webkit.org/show_bug.cgi?id=87748
 fast/forms/select/optgroup-clicking.html
 
-# Assertion failure on mac-lion-wk2, no reftest results on mac
-# https://bugs.webkit.org/show_bug.cgi?id=88356
-fast/hidpi/device-scale-factor-paint.html
-
 # https://bugs.webkit.org/show_bug.cgi?id=88672
 svg/filters/color-space-conversion.svg
 

Added: trunk/LayoutTests/platform/mac/fast/hidpi/device-scale-factor-paint-expected.png (0 => 120894)


--- trunk/LayoutTests/platform/mac/fast/hidpi/device-scale-factor-paint-expected.png	                        (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/hidpi/device-scale-factor-paint-expected.png	2012-06-21 01:29:36 UTC (rev 120894)
@@ -0,0 +1,5 @@
+\x89PNG
+
+
+IHDR@\xB0\xA3\x86\x97)tEXtchecksumacfb0265eac201ed58fe0d5deb83ef04\xA1@\x82e IDATx\x9C\xEC\xDB1
+\xC3@A\x9D\xF0\xBF\x8D_\xBE\xFA\x822g\x9A\xAAx\x83ɛ]33@ȹ{\xC0\xD3 Gr Gr Gr Gr Gr Gr Gr Gr Gr^w\xD7g\xFDr_\x9A\xF7\xEC\x9E\xCB\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90#\x809\x90\xB3ffv\x8Fx\x92 Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr Gr G\xB8ڳ\x80A\xFE\xD6\xF7\xF8J#`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\x86\x9F#\xB8\xD9IDAT\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xD8 \xC0\x8Ev\xB0#@\x80\xEC`G\x80;\xF2}Y\x9A\xEE\xD8IIEND\xAEB`\x82
\ No newline at end of file

Added: trunk/LayoutTests/platform/mac/fast/hidpi/device-scale-factor-paint-expected.txt (0 => 120894)


--- trunk/LayoutTests/platform/mac/fast/hidpi/device-scale-factor-paint-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/hidpi/device-scale-factor-paint-expected.txt	2012-06-21 01:29:36 UTC (rev 120894)
@@ -0,0 +1,7 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x8
+  RenderBlock {HTML} at (0,0) size 800x8
+    RenderBody {BODY} at (8,8) size 784x0
+layer at (5,10) size 50x50
+  RenderBlock (positioned) {DIV} at (5,10) size 50x50 [bgcolor=#008000]

Modified: trunk/LayoutTests/platform/wk2/Skipped (120893 => 120894)


--- trunk/LayoutTests/platform/wk2/Skipped	2012-06-21 01:13:56 UTC (rev 120893)
+++ trunk/LayoutTests/platform/wk2/Skipped	2012-06-21 01:29:36 UTC (rev 120894)
@@ -1293,10 +1293,6 @@
 # https://bugs.webkit.org/show_bug.cgi?id=87168
 fast/forms/input-search-press-escape-key.html
 
-# [WK2] fast/hidpi/device-scale-factor-paint.html crashes
-# https://bugs.webkit.org/show_bug.cgi?id=88350
-fast/hidpi/device-scale-factor-paint.html
-
 # Editing input tests that time out unexpectedly.
 # https://bugs.webkit.org/show_bug.cgi?id=81547
 editing/input/reveal-edit-on-input-vertically.html
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to