Title: [114074] trunk
Revision
114074
Author
[email protected]
Date
2012-04-12 19:51:18 -0700 (Thu, 12 Apr 2012)

Log Message

REGRESSION (r113900): Text tests started failing
https://bugs.webkit.org/show_bug.cgi?id=83724

Reviewed by Dan Bernstein.

Source/WebCore:

* Resources/DefaultFonts.plist.in: Use serif fonts for standard family again,
and updated the list with better fonts for Japanese.

LayoutTests:

* platform/mac/Skipped: unskip the tests.

* platform/mac/fast/ruby/nested-ruby-expected.png:
* platform/mac/fast/ruby/nested-ruby-expected.txt:
* platform/mac/fast/text/international/002-expected.png:
* platform/mac/fast/text/international/002-expected.txt:
Updated for minor rendering differences.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (114073 => 114074)


--- trunk/LayoutTests/ChangeLog	2012-04-13 02:49:52 UTC (rev 114073)
+++ trunk/LayoutTests/ChangeLog	2012-04-13 02:51:18 UTC (rev 114074)
@@ -1,3 +1,18 @@
+2012-04-12  Alexey Proskuryakov  <[email protected]>
+
+        REGRESSION (r113900): Text tests started failing
+        https://bugs.webkit.org/show_bug.cgi?id=83724
+
+        Reviewed by Dan Bernstein.
+
+        * platform/mac/Skipped: unskip the tests.
+
+        * platform/mac/fast/ruby/nested-ruby-expected.png:
+        * platform/mac/fast/ruby/nested-ruby-expected.txt:
+        * platform/mac/fast/text/international/002-expected.png:
+        * platform/mac/fast/text/international/002-expected.txt:
+        Updated for minor rendering differences.
+
 2012-04-12  David Dorwin  <[email protected]>
 
         Add Encrypted Media Extensions events and errors to HTMLMediaElement

Modified: trunk/LayoutTests/platform/mac/Skipped (114073 => 114074)


--- trunk/LayoutTests/platform/mac/Skipped	2012-04-13 02:49:52 UTC (rev 114073)
+++ trunk/LayoutTests/platform/mac/Skipped	2012-04-13 02:51:18 UTC (rev 114074)
@@ -798,8 +798,3 @@
 
 # https://bugs.webkit.org/show_bug.cgi?id=83618
 fast/dom/inline-event-attributes-release.html
-
-# https://bugs.webkit.org/show_bug.cgi?id=83724
-fast/ruby/nested-ruby.html
-fast/text/international/002.html
-

Modified: trunk/LayoutTests/platform/mac/fast/ruby/nested-ruby-expected.png


(Binary files differ)

Modified: trunk/LayoutTests/platform/mac/fast/ruby/nested-ruby-expected.txt (114073 => 114074)


--- trunk/LayoutTests/platform/mac/fast/ruby/nested-ruby-expected.txt	2012-04-13 02:49:52 UTC (rev 114073)
+++ trunk/LayoutTests/platform/mac/fast/ruby/nested-ruby-expected.txt	2012-04-13 02:51:18 UTC (rev 114074)
@@ -3,46 +3,46 @@
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x576
-      RenderBlock {P} at (0,0) size 784x42
+      RenderBlock {P} at (0,0) size 784x43
         RenderRuby (inline) {RUBY} at (0,0) size 88x18
-          RenderRubyRun (anonymous) at (0,11) size 88x31
+          RenderRubyRun (anonymous) at (0,11) size 88x32
             RenderRubyText {RT} at (0,-11) size 88x10
               RenderText {#text} at (15,0) size 58x10
                 text run at (15,0) width 58: "K\x{14D}kakukid\x{14D}tai"
-            RenderRubyBase (anonymous) at (0,0) size 88x31
-              RenderRuby (inline) {RUBY} at (0,0) size 88x18
-                RenderRubyRun (anonymous) at (0,7) size 18x24
-                  RenderRubyText {RT} at (0,-8) size 18x14
-                    RenderText {#text} at (0,1) size 18x10
+            RenderRubyBase (anonymous) at (0,0) size 88x32
+              RenderRuby (inline) {RUBY} at (0,0) size 88x17
+                RenderRubyRun (anonymous) at (0,8) size 18x24
+                  RenderRubyText {RT} at (0,-9) size 18x14
+                    RenderText {#text} at (0,1) size 18x11
                       text run at (0,1) width 18: "\x{3053}\x{3046}"
                   RenderRubyBase (anonymous) at (0,0) size 18x24
-                    RenderText {#text} at (1,3) size 16x18
+                    RenderText {#text} at (1,3) size 16x17
                       text run at (1,3) width 16: "\x{653B}"
-                RenderRubyRun (anonymous) at (18,7) size 18x24
-                  RenderRubyText {RT} at (0,-8) size 18x14
-                    RenderText {#text} at (0,1) size 18x10
+                RenderRubyRun (anonymous) at (18,8) size 18x24
+                  RenderRubyText {RT} at (0,-9) size 18x14
+                    RenderText {#text} at (0,1) size 18x11
                       text run at (0,1) width 18: "\x{304B}\x{304F}"
                   RenderRubyBase (anonymous) at (0,0) size 18x24
-                    RenderText {#text} at (1,3) size 16x18
+                    RenderText {#text} at (1,3) size 16x17
                       text run at (1,3) width 16: "\x{6BBB}"
-                RenderRubyRun (anonymous) at (36,7) size 16x24
-                  RenderRubyText {RT} at (0,-8) size 16x14
-                    RenderText {#text} at (3,1) size 10x10
+                RenderRubyRun (anonymous) at (36,8) size 16x24
+                  RenderRubyText {RT} at (0,-9) size 16x14
+                    RenderText {#text} at (3,1) size 10x11
                       text run at (3,1) width 10: "\x{304D}"
                   RenderRubyBase (anonymous) at (0,0) size 16x24
-                    RenderText {#text} at (0,3) size 16x18
+                    RenderText {#text} at (0,3) size 16x17
                       text run at (0,3) width 16: "\x{6A5F}"
-                RenderRubyRun (anonymous) at (52,7) size 18x24
-                  RenderRubyText {RT} at (0,-8) size 18x14
-                    RenderText {#text} at (0,1) size 18x10
+                RenderRubyRun (anonymous) at (52,8) size 18x24
+                  RenderRubyText {RT} at (0,-9) size 18x14
+                    RenderText {#text} at (0,1) size 18x11
                       text run at (0,1) width 18: "\x{3069}\x{3046}"
                   RenderRubyBase (anonymous) at (0,0) size 18x24
-                    RenderText {#text} at (1,3) size 16x18
+                    RenderText {#text} at (1,3) size 16x17
                       text run at (1,3) width 16: "\x{52D5}"
-                RenderRubyRun (anonymous) at (70,7) size 18x24
-                  RenderRubyText {RT} at (0,-8) size 18x14
-                    RenderText {#text} at (0,1) size 18x10
+                RenderRubyRun (anonymous) at (70,8) size 18x24
+                  RenderRubyText {RT} at (0,-9) size 18x14
+                    RenderText {#text} at (0,1) size 18x11
                       text run at (0,1) width 18: "\x{305F}\x{3044}"
                   RenderRubyBase (anonymous) at (0,0) size 18x24
-                    RenderText {#text} at (1,3) size 16x18
+                    RenderText {#text} at (1,3) size 16x17
                       text run at (1,3) width 16: "\x{968A}"

Modified: trunk/LayoutTests/platform/mac/fast/text/international/002-expected.png


(Binary files differ)

Modified: trunk/LayoutTests/platform/mac/fast/text/international/002-expected.txt (114073 => 114074)


--- trunk/LayoutTests/platform/mac/fast/text/international/002-expected.txt	2012-04-13 02:49:52 UTC (rev 114073)
+++ trunk/LayoutTests/platform/mac/fast/text/international/002-expected.txt	2012-04-13 02:51:18 UTC (rev 114074)
@@ -7,10 +7,10 @@
         RenderTableSection {TBODY} at (0,0) size 280x144
           RenderTableRow {TR} at (0,0) size 280x144
             RenderTableCell {TD} at (0,0) size 280x144 [r=0 c=0 rs=1 cs=1]
-              RenderText {#text} at (0,3) size 276x138
+              RenderText {#text} at (0,3) size 277x137
                 text run at (0,3) width 272: "\x{8AB0}\x{3067}\x{3082}\x{3042}\x{306A}\x{305F}\x{306E}\x{30C9}\x{30AD}\x{30E5}\x{30E1}\x{30F3}\x{30C8}\x{3092}\x{30AA}\x{30EA}\x{30B8}"
-                text run at (0,27) width 260: "\x{30CA}\x{30EB}\x{306E}\x{4F53}\x{88C1}\x{3067}\x{958B}\x{304F}\x{3053}\x{3068}\x{304C}\x{3067}\x{304D}\x{307E}\x{3059}\x{3002} "
-                text run at (260,27) width 16: "\x{3042}"
+                text run at (0,27) width 261: "\x{30CA}\x{30EB}\x{306E}\x{4F53}\x{88C1}\x{3067}\x{958B}\x{304F}\x{3053}\x{3068}\x{304C}\x{3067}\x{304D}\x{307E}\x{3059}\x{3002} "
+                text run at (261,27) width 16: "\x{3042}"
                 text run at (0,51) width 272: "\x{306A}\x{305F}\x{306E}\x{610F}\x{56F3}\x{3057}\x{305F}\x{3068}\x{304A}\x{308A}\x{306B}\x{60C5}\x{5831}\x{3092}\x{4F1D}\x{3048}\x{308B}"
                 text run at (0,75) width 272: "\x{3053}\x{3068}\x{304C}\x{3067}\x{304D}\x{307E}\x{3059}\x{3002}\x{3055}\x{3089}\x{306B}\x{3001}\x{30D6}\x{30E9}\x{30A6}\x{30B6}\x{304B}"
                 text run at (0,99) width 272: "\x{3089}\x{30B3}\x{30E1}\x{30F3}\x{30C8}\x{3084}\x{30DE}\x{30FC}\x{30AF}\x{30A2}\x{30C3}\x{30D7}\x{3092}\x{66F8}\x{304D}\x{8FBC}\x{3093}"

Modified: trunk/Source/WebCore/ChangeLog (114073 => 114074)


--- trunk/Source/WebCore/ChangeLog	2012-04-13 02:49:52 UTC (rev 114073)
+++ trunk/Source/WebCore/ChangeLog	2012-04-13 02:51:18 UTC (rev 114074)
@@ -1,5 +1,15 @@
 2012-04-12  Alexey Proskuryakov  <[email protected]>
 
+        REGRESSION (r113900): Text tests started failing
+        https://bugs.webkit.org/show_bug.cgi?id=83724
+
+        Reviewed by Dan Bernstein.
+
+        * Resources/DefaultFonts.plist.in: Use serif fonts for standard family again,
+        and updated the list with better fonts for Japanese.
+
+2012-04-12  Alexey Proskuryakov  <[email protected]>
+
         Preprocessing text files with modern clang treats double slashes in comments
         https://bugs.webkit.org/show_bug.cgi?id=83827
 

Modified: trunk/Source/WebCore/Resources/DefaultFonts.plist.in (114073 => 114074)


--- trunk/Source/WebCore/Resources/DefaultFonts.plist.in	2012-04-13 02:49:52 UTC (rev 114073)
+++ trunk/Source/WebCore/Resources/DefaultFonts.plist.in	2012-04-13 02:51:18 UTC (rev 114074)
@@ -2,60 +2,58 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>hant</key> /* Traditional Chinese */
+    <key>hant</key> <!-- Traditional Chinese -->
     <dict>
         <key>monospace</key>
         <string>Heiti TC</string>
         <key>standard</key>
-        <string>Heiti TC</string>
+        <string>Apple LiSung</string>
         <key>sans-serif</key>
         <string>Heiti TC</string>
         <key>serif</key>
         <string>Apple LiSung</string>
     </dict>
-    <key>hans</key> /* Simplified Chinese */
+    <key>hans</key> <!-- Simplified Chinese -->
     <dict>
         <key>monospace</key>
         <string>Heiti SC</string>
         <key>standard</key>
-        <string>Heiti SC</string>
+        <string>STSong</string>
         <key>sans-serif</key>
         <string>Heiti SC</string>
         <key>serif</key>
         <string>STSong</string>
     </dict>
-    <key>hrkt</key>  /* Japanese */
+    <key>hrkt</key>  <!-- Japanese -->
     <dict>
         <key>monospace</key>
         <string>Osaka-Mono</string>
         <key>standard</key>
-        <string>Hiragino Kaku Gothic Pro</string>
+        <string>Hiragino Mincho ProN</string>
         <key>sans-serif</key>
-        <string>Hiragino Kaku Gothic Pro</string>
+        <string>Hiragino Kaku Gothic ProN</string>
         <key>serif</key>
-        <string>Hiragino Mincho Pro</string>
+        <string>Hiragino Mincho ProN</string>
     </dict>
-    <key>hang</key> /* Korean */
+    <key>hang</key> <!-- Korean -->
     <dict>
+        <key>standard</key>
+        <string>AppleMyungjo</string>
 #if !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
         <key>monospace</key>
         <string>Apple SD Gothic Neo</string>
-        <key>standard</key>
-        <string>Apple SD Gothic Neo</string>
         <key>sans-serif</key>
         <string>Apple SD Gothic Neo</string>
 #else
         <key>monospace</key>
         <string>AppleGothic</string>
-        <key>standard</key>
-        <string>AppleGothic</string>
         <key>sans-serif</key>
         <string>AppleGothic</string>
 #endif
         <key>serif</key>
         <string>AppleMyungjo</string>
     </dict>
-    <key>zyyy</key> /* Other scripts (USCRIPT_COMMON) */
+    <key>zyyy</key> <!-- Other scripts (USCRIPT_COMMON) -->
     <dict>
         <key>monospace</key>
         <string>Courier</string>
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to