Changeset 109126 in webkit

Timestamp:

Feb 28, 2012 11:24:26 AM (12 years ago)

Author:

eae@chromium.org

Message:

Fix printing/zoomed-document.html for QT
​https://bugs.webkit.org/show_bug.cgi?id=79808

Reviewed by Adam Barth.

Fix zoomed document test case to work on QT port and remove it from skip
list.

• platform/qt/Skipped:
• printing/zoomed-document.html:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• platform/qt/Skipped (modified) (1 diff)
• printing/zoomed-document.html (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-28  Emil A Eklund  <eae@chromium.org>
+
+        Fix printing/zoomed-document.html for QT
+        https://bugs.webkit.org/show_bug.cgi?id=79808
+
+        Reviewed by Adam Barth.
+
+        Fix zoomed document test case to work on QT port and remove it from skip
+        list.
+
+        * platform/qt/Skipped:
+        * printing/zoomed-document.html:
+
 2012-02-28  Alok Priyadarshi  <alokp@chromium.org>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -2657 +2657 @@
 # https://bugs.webkit.org/show_bug.cgi?id=79564
 transitions/cancel-transition.html
-
-# Printed font-size should not be dependant on zoom level
-# New test introduced in r109073 fails on Qt
-# https://bugs.webkit.org/show_bug.cgi?id=79717
-printing/zoomed-document.html

trunk/LayoutTests/printing/zoomed-document.html

@@ -10 +10 @@
     var msg = 'Document zoom should not apply when printing.';
     var pass = true;
-
+    
+    // Determine minium page size height where text fits on a single page.
+    var height;
+    for (var i = 10; i < 100; i += 5) {
+        if (layoutTestController.numberOfPages(100, i) == 1) {
+            height = i;
+            break;
+        }
+    }
+    
+    // Zoom in and verify that page count does not change.
     for (var i = 0; i < 10; i++) {
-        var numberOfPages = layoutTestController.numberOfPages(100, 30);
+        var numberOfPages = layoutTestController.numberOfPages(100, height);
         if (numberOfPages != 1) {
             pass = false;
-            msg += 'Got ' + numberOfPages + ' pages, expected 1.\n';
+            msg += 'Got ' + numberOfPages + ' pages, expected 1 page.\n';
         }
         eventSender.zoomPageIn();