git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 85cb593)
Unskip fast/hidpi/device-scale-factor-paint.html
authorabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Jun 2012 01:29:36 +0000 (01:29 +0000)
committerabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Jun 2012 01:29:36 +0000 (01:29 +0000)
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:

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

LayoutTests/ChangeLog patch | blob | history
LayoutTests/fast/hidpi/device-scale-factor-paint-expected.html [deleted file] patch | blob | history
LayoutTests/fast/hidpi/device-scale-factor-paint.html patch | blob | history
LayoutTests/platform/mac/Skipped patch | blob | history
LayoutTests/platform/mac/fast/hidpi/device-scale-factor-paint-expected.png [new file with mode: 0644] patch | blob
LayoutTests/platform/mac/fast/hidpi/device-scale-factor-paint-expected.txt [new file with mode: 0644] patch | blob
LayoutTests/platform/wk2/Skipped patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c0c177c..3f92ec9 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,25 @@
+2012-06-20  Adam Barth  <abarth@webkit.org>
+
+        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  <jsbell@chromium.org>
 
         IndexedDB: Remove redundant IDBObjectStore.delete() overloads
diff --git a/LayoutTests/fast/hidpi/device-scale-factor-paint-expected.html b/LayoutTests/fast/hidpi/device-scale-factor-paint-expected.html
deleted file mode 100644 (file)
index 1653469..0000000
--- a/LayoutTests/fast/hidpi/device-scale-factor-paint-expected.html
+++ /dev/null
@@ -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>
diff --git a/LayoutTests/fast/hidpi/device-scale-factor-paint.html b/LayoutTests/fast/hidpi/device-scale-factor-paint.html
index 294efb0..8c47e91 100644 (file)
--- a/LayoutTests/fast/hidpi/device-scale-factor-paint.html
+++ b/LayoutTests/fast/hidpi/device-scale-factor-paint.html
@@ -9,7 +9,7 @@
     }
     
     function finishTest() {
-        setTimeout(layoutTestController.notifyDone, 0);
+        setTimeout(function() { layoutTestController.notifyDone() }, 0);
     }
 </script>
 </head>
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index 4c422b8..0276e2a 100644 (file)
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -884,10 +884,6 @@ fast/events/message-port-clone.html
 # 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
 
diff --git a/LayoutTests/platform/mac/fast/hidpi/device-scale-factor-paint-expected.png b/LayoutTests/platform/mac/fast/hidpi/device-scale-factor-paint-expected.png
new file mode 100644 (file)
index 0000000..4edf743
Binary files /dev/null and b/LayoutTests/platform/mac/fast/hidpi/device-scale-factor-paint-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/hidpi/device-scale-factor-paint-expected.txt b/LayoutTests/platform/mac/fast/hidpi/device-scale-factor-paint-expected.txt
new file mode 100644 (file)
index 0000000..9ec95df
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/hidpi/device-scale-factor-paint-expected.txt
@@ -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]
diff --git a/LayoutTests/platform/wk2/Skipped b/LayoutTests/platform/wk2/Skipped
index badb05c..5f85b2a 100644 (file)
--- a/LayoutTests/platform/wk2/Skipped
+++ b/LayoutTests/platform/wk2/Skipped
@@ -1293,10 +1293,6 @@ http/tests/security/local-image-from-remote-whitelisted.html
 # 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
Mirror of the WebKit open source project from svn.webkit.org.