git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: df3ed4e)
2006-10-30 Mark Rowe <bdash@webkit.org>
authorbdash <bdash@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 29 Oct 2006 12:21:37 +0000 (12:21 +0000)
committerbdash <bdash@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 29 Oct 2006 12:21:37 +0000 (12:21 +0000)
        Reviewed by Maciej.

        Fix fast/block/basic/014.html to pass when Microsoft Office fonts are present.

        * fast/block/basic/014-expected.checksum:
        * fast/block/basic/014-expected.png:
        * fast/block/basic/014-expected.txt:
        * fast/block/basic/014.html: Always use default sans-serif font rather than
        preferring Microsoft Office fonts.

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

LayoutTests/ChangeLog patch | blob | history
LayoutTests/fast/block/basic/014-expected.checksum patch | blob | history
LayoutTests/fast/block/basic/014-expected.png patch | blob | history
LayoutTests/fast/block/basic/014-expected.txt patch | blob | history
LayoutTests/fast/block/basic/014.html patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index fa779b57302294e8f1c319fd1ff17dc8baff5e1a..ef4c6c3e061cf650eaf7f7400a5d63ef76fed177 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2006-10-30  Mark Rowe  <bdash@webkit.org>
+
+        Reviewed by Maciej.
+
+        Fix fast/block/basic/014.html to pass when Microsoft Office fonts are present.
+
+        * fast/block/basic/014-expected.checksum:
+        * fast/block/basic/014-expected.png:
+        * fast/block/basic/014-expected.txt:
+        * fast/block/basic/014.html: Always use default sans-serif font rather than
+        preferring Microsoft Office fonts.
+
 2006-10-29  Mark Rowe  <bdash@webkit.org>
 
         Reviewed by Mitz.
diff --git a/LayoutTests/fast/block/basic/014-expected.checksum b/LayoutTests/fast/block/basic/014-expected.checksum
index d3b6970337521adfea9635e368eb59651a77e4e1..9ef65102f70065abf80b5dc272ad62c75d0fd6db 100644 (file)
--- a/LayoutTests/fast/block/basic/014-expected.checksum
+++ b/LayoutTests/fast/block/basic/014-expected.checksum
@@ -1 +1 @@
-b36c71d9f45a20609d058c986941e251
\ No newline at end of file
+15f27d21b92dae5acf16628cffc04bba
\ No newline at end of file
diff --git a/LayoutTests/fast/block/basic/014-expected.png b/LayoutTests/fast/block/basic/014-expected.png
index 1c80350c6b6d4e716a8e68c25fa70e6638becd60..8e965815297357c497c1300026a9ac65b37831ab 100644 (file)
Binary files a/LayoutTests/fast/block/basic/014-expected.png and b/LayoutTests/fast/block/basic/014-expected.png differ
diff --git a/LayoutTests/fast/block/basic/014-expected.txt b/LayoutTests/fast/block/basic/014-expected.txt
index 552e3caf365ec538e07c9d117205a01babbfb99f..f918bad9846d1786cc1d09f9bfc9edc093c6309c 100644 (file)
--- a/LayoutTests/fast/block/basic/014-expected.txt
+++ b/LayoutTests/fast/block/basic/014-expected.txt
@@ -8,5 +8,5 @@ layer at (0,0) size 800x600
       RenderText {#text} at (21,0) size 4x16
         text run at (21,0) width 4: " "
       RenderImage {IMG} at (25,0) size 21x21 [bgcolor=#008000]
-      RenderText {#text} at (46,0) size 271x16
-        text run at (46,0) width 271: " The two green blocks should line up vertically."
+      RenderText {#text} at (46,0) size 295x16
+        text run at (46,0) width 295: " The two green blocks should line up vertically."
diff --git a/LayoutTests/fast/block/basic/014.html b/LayoutTests/fast/block/basic/014.html
index 1b5ea8311e6b758de8448a5b2bd3831d7404b771..5077af4b73699c711127b2d3f3c931bc914ee38f 100644 (file)
--- a/LayoutTests/fast/block/basic/014.html
+++ b/LayoutTests/fast/block/basic/014.html
@@ -2,7 +2,7 @@
 <head>
 <style>
 body {
-   font-family: 'Gill Sans', Arial, Helvetica, sans-serif;
+   font-family: sans-serif;
    font-size: 14px;
 }
 
Mirror of the WebKit open source project from svn.webkit.org.