2011-03-30 Adam Barth <abarth@webkit.org>

        Reviewed by Dan Bernstein.

        Update Mac Leopard baselines after r82056
        https://bugs.webkit.org/show_bug.cgi?id=57428

        These expected results differ from old ones just by a pixel or two.
        I suspect they're caused by text metrics differences, but I haven't
        confirmed visually.

        * platform/mac-leopard/fast/ruby/base-shorter-than-text-expected.txt:
        * platform/mac-leopard/fast/text/emphasis-combined-text-expected.txt:
        * platform/mac-leopard/fast/text/international/text-combine-image-test-expected.txt:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a24005b48f050aa9a41484504b8ce37df090692c..a3025b8dee5459b374c327610be606b7e74dcbef 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2011-03-30  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Dan Bernstein.
+
+        Update Mac Leopard baselines after r82056
+        https://bugs.webkit.org/show_bug.cgi?id=57428
+
+        These expected results differ from old ones just by a pixel or two.
+        I suspect they're caused by text metrics differences, but I haven't
+        confirmed visually.
+
+        * platform/mac-leopard/fast/ruby/base-shorter-than-text-expected.txt:
+        * platform/mac-leopard/fast/text/emphasis-combined-text-expected.txt:
+        * platform/mac-leopard/fast/text/international/text-combine-image-test-expected.txt:
+
 2011-03-30  Kent Tamura  <tkent@chromium.org>
 
         Reviewed by Ojan Vafai.

diff --git a/LayoutTests/platform/mac-leopard/fast/ruby/base-shorter-than-text-expected.txt b/LayoutTests/platform/mac-leopard/fast/ruby/base-shorter-than-text-expected.txt
index e3c84f77820595e531383a5fbc649938cf16d037..379c497f22f223d5789d9b66595b59b60f185e1a 100644 (file)
--- a/LayoutTests/platform/mac-leopard/fast/ruby/base-shorter-than-text-expected.txt
+++ b/LayoutTests/platform/mac-leopard/fast/ruby/base-shorter-than-text-expected.txt
@@ -25,22 +25,22 @@ layer at (0,0) size 800x600
         RenderText {#text} at (0,0) size 0x0
       RenderBlock {DIV} at (0,200) size 216x300
         RenderBlock {P} at (16,0) size 84x300
-          RenderRuby (inline) {RUBY} at (0,0) size 48x144
-            RenderRubyRun (anonymous) at (12,0) size 72x144
-              RenderRubyText {RT} at (-18,0) size 36x144
-                RenderText {#text} at (6,0) size 24x144
-                  text run at (6,0) width 144: "\x{304D}\x{3069}\x{3046}\x{305F}\x{3044}\x{304D}"
-              RenderRubyBase (anonymous) at (0,0) size 72x144
-                RenderText {#text} at (12,12) size 48x120
-                  text run at (12,12) width 120: "\x{653B}\x{6BBB}"
+          RenderRuby (inline) {RUBY} at (0,0) size 48x146
+            RenderRubyRun (anonymous) at (12,0) size 72x146
+              RenderRubyText {RT} at (-18,0) size 36x146
+                RenderText {#text} at (6,0) size 24x146
+                  text run at (6,0) width 146: "\x{304D}\x{3069}\x{3046}\x{305F}\x{3044}\x{304D}"
+              RenderRubyBase (anonymous) at (0,0) size 72x146
+                RenderText {#text} at (12,12) size 48x121
+                  text run at (12,12) width 121: "\x{653B}\x{6BBB}"
           RenderText {#text} at (0,0) size 0x0
         RenderBlock {P} at (116,0) size 84x300
-          RenderRuby (inline) {RUBY} at (0,0) size 48x192
-            RenderRubyRun (anonymous) at (12,0) size 72x192
-              RenderRubyText {RT} at (-18,0) size 36x192
-                RenderText {#text} at (6,0) size 24x192
-                  text run at (6,0) width 192: "\x{304D}\x{3069}\x{3046}\x{305F}\x{3044}\x{304D}\x{3069}\x{3046}"
-              RenderRubyBase (anonymous) at (0,0) size 72x192
-                RenderText {#text} at (12,8) size 48x176
-                  text run at (12,8) width 176: "\x{6A5F}\x{52D5}\x{968A}"
+          RenderRuby (inline) {RUBY} at (0,0) size 48x194
+            RenderRubyRun (anonymous) at (12,0) size 72x194
+              RenderRubyText {RT} at (-18,0) size 36x194
+                RenderText {#text} at (6,0) size 24x194
+                  text run at (6,0) width 194: "\x{304D}\x{3069}\x{3046}\x{305F}\x{3044}\x{304D}\x{3069}\x{3046}"
+              RenderRubyBase (anonymous) at (0,0) size 72x194
+                RenderText {#text} at (12,8) size 48x178
+                  text run at (12,8) width 178: "\x{6A5F}\x{52D5}\x{968A}"
           RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/platform/mac-leopard/fast/text/emphasis-combined-text-expected.txt b/LayoutTests/platform/mac-leopard/fast/text/emphasis-combined-text-expected.txt
index d9ab2b956afdf53a3f5ec25652d4c7c464142d2d..d78fd716444c6c126fbd1a4db9490e3114e5d587 100644 (file)
--- a/LayoutTests/platform/mac-leopard/fast/text/emphasis-combined-text-expected.txt
+++ b/LayoutTests/platform/mac-leopard/fast/text/emphasis-combined-text-expected.txt
@@ -4,32 +4,32 @@ layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 744x584
       RenderBlock {P} at (0,0) size 84x584
-        RenderInline {SPAN} at (0,0) size 48x192
-          RenderText {#text} at (24,0) size 48x96
-            text run at (24,0) width 96: "\x{6587}\x{5B57}"
-          RenderInline {SPAN} at (0,0) size 48x48
-            RenderCombineText {#text} at (24,96) size 48x48
+        RenderInline {SPAN} at (0,0) size 48x194
+          RenderText {#text} at (24,0) size 48x97
+            text run at (24,0) width 97: "\x{6587}\x{5B57}"
+          RenderInline {SPAN} at (0,0) size 48x49
+            RenderCombineText {#text} at (24,96) size 48x49
               text run at (24,96) width 48: "\x{FFFC}"
-          RenderText {#text} at (24,144) size 48x48
-            text run at (24,144) width 48: "\x{5E74}"
+          RenderText {#text} at (24,144) size 48x50
+            text run at (24,144) width 49: "\x{5E74}"
         RenderText {#text} at (0,0) size 0x0
       RenderBlock {P} at (132,0) size 84x584
-        RenderInline {SPAN} at (0,0) size 48x192
-          RenderText {#text} at (24,0) size 48x96
-            text run at (24,0) width 96: "\x{6587}\x{5B57}"
-          RenderInline {SPAN} at (0,0) size 48x48
-            RenderCombineText {#text} at (24,96) size 48x48
+        RenderInline {SPAN} at (0,0) size 48x194
+          RenderText {#text} at (24,0) size 48x97
+            text run at (24,0) width 97: "\x{6587}\x{5B57}"
+          RenderInline {SPAN} at (0,0) size 48x49
+            RenderCombineText {#text} at (24,96) size 48x49
               text run at (24,96) width 48: "\x{FFFC}"
-          RenderText {#text} at (24,144) size 48x48
-            text run at (24,144) width 48: "\x{5E74}"
+          RenderText {#text} at (24,144) size 48x50
+            text run at (24,144) width 49: "\x{5E74}"
         RenderText {#text} at (0,0) size 0x0
       RenderBlock {P} at (264,0) size 84x584
-        RenderInline {SPAN} at (0,0) size 48x192
-          RenderText {#text} at (24,0) size 48x96
-            text run at (24,0) width 96: "\x{6587}\x{5B57}"
-          RenderInline {SPAN} at (0,0) size 48x48
-            RenderCombineText {#text} at (24,96) size 48x48
+        RenderInline {SPAN} at (0,0) size 48x194
+          RenderText {#text} at (24,0) size 48x97
+            text run at (24,0) width 97: "\x{6587}\x{5B57}"
+          RenderInline {SPAN} at (0,0) size 48x49
+            RenderCombineText {#text} at (24,96) size 48x49
               text run at (24,96) width 48: "\x{FFFC}"
-          RenderText {#text} at (24,144) size 48x48
-            text run at (24,144) width 48: "\x{5E74}"
+          RenderText {#text} at (24,144) size 48x50
+            text run at (24,144) width 49: "\x{5E74}"
         RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/platform/mac-leopard/fast/text/international/text-combine-image-test-expected.txt b/LayoutTests/platform/mac-leopard/fast/text/international/text-combine-image-test-expected.txt
index 2c409375e496c70f9be331aff8e3d3b858f7d6be..735de2bf618a695bc63ed8d53199343e75715a5f 100644 (file)
--- a/LayoutTests/platform/mac-leopard/fast/text/international/text-combine-image-test-expected.txt
+++ b/LayoutTests/platform/mac-leopard/fast/text/international/text-combine-image-test-expected.txt
@@ -5,38 +5,38 @@ layer at (166,0) size 634x600
     RenderBody {BODY} at (8,8) size 594x584
       RenderBlock {HR} at (0,0) size 2x584 [border: (1px inset #000000)]
       RenderBlock (anonymous) at (10,0) size 48x584
-        RenderInline {SPAN} at (0,0) size 32x468
-          RenderText {#text} at (8,0) size 32x468
-            text run at (8,0) width 468: "OFF=\x{897F}\x{66A6}2010\x{5E74}1\x{6708}20\x{65E5}365\x{56DE}"
+        RenderInline {SPAN} at (0,0) size 32x469
+          RenderText {#text} at (8,0) size 32x469
+            text run at (8,0) width 469: "OFF=\x{897F}\x{66A6}2010\x{5E74}1\x{6708}20\x{65E5}365\x{56DE}"
         RenderText {#text} at (0,0) size 0x0
       RenderBlock {HR} at (66,0) size 2x584 [border: (1px inset #000000)]
       RenderBlock (anonymous) at (76,0) size 48x584
-        RenderInline {SPAN} at (0,0) size 32x374
+        RenderInline {SPAN} at (0,0) size 32x376
           RenderInline {SPAN} at (0,0) size 32x32
             RenderCombineText {#text} at (8,0) size 32x32
               text run at (8,0) width 32: "\x{FFFC}"
-          RenderText {#text} at (8,32) size 32x86
-            text run at (8,32) width 86: "=\x{897F}\x{66A6}"
+          RenderText {#text} at (8,32) size 32x87
+            text run at (8,32) width 87: "=\x{897F}\x{66A6}"
           RenderInline {SPAN} at (0,0) size 32x33
-            RenderCombineText {#text} at (8,117) size 32x33
-              text run at (8,117) width 32: "\x{FFFC}"
-          RenderText {#text} at (8,149) size 32x33
-            text run at (8,149) width 32: "\x{5E74}"
+            RenderCombineText {#text} at (8,118) size 32x33
+              text run at (8,118) width 32: "\x{FFFC}"
+          RenderText {#text} at (8,150) size 32x33
+            text run at (8,150) width 33: "\x{5E74}"
           RenderInline {SPAN} at (0,0) size 32x33
-            RenderCombineText {#text} at (8,181) size 32x33
-              text run at (8,181) width 32: "\x{FFFC}"
-          RenderText {#text} at (8,213) size 32x33
-            text run at (8,213) width 32: "\x{6708}"
+            RenderCombineText {#text} at (8,182) size 32x33
+              text run at (8,182) width 32: "\x{FFFC}"
+          RenderText {#text} at (8,214) size 32x33
+            text run at (8,214) width 33: "\x{6708}"
           RenderInline {SPAN} at (0,0) size 32x33
-            RenderCombineText {#text} at (8,245) size 32x33
-              text run at (8,245) width 32: "\x{FFFC}"
-          RenderText {#text} at (8,277) size 32x33
-            text run at (8,277) width 32: "\x{65E5}"
+            RenderCombineText {#text} at (8,246) size 32x33
+              text run at (8,246) width 32: "\x{FFFC}"
+          RenderText {#text} at (8,278) size 32x33
+            text run at (8,278) width 33: "\x{65E5}"
           RenderInline {SPAN} at (0,0) size 32x33
-            RenderCombineText {#text} at (8,309) size 32x33
-              text run at (8,309) width 32: "\x{FFFC}"
-          RenderText {#text} at (8,341) size 32x33
-            text run at (8,341) width 32: "\x{56DE}"
+            RenderCombineText {#text} at (8,310) size 32x33
+              text run at (8,310) width 32: "\x{FFFC}"
+          RenderText {#text} at (8,342) size 32x34
+            text run at (8,342) width 33: "\x{56DE}"
         RenderText {#text} at (0,0) size 0x0
       RenderBlock {HR} at (132,0) size 2x584 [border: (1px inset #000000)]
       RenderBlock (anonymous) at (142,0) size 48x584
@@ -98,31 +98,31 @@ layer at (166,0) size 634x600
       RenderBlock (anonymous) at (320,0) size 274x584
         RenderBlock {HR} at (0,0) size 2x584 [border: (1px inset #000000)]
         RenderBlock {P} at (34,0) size 240x584
-          RenderBlock (floating) {SPAN} at (0,319) size 38x265 [border: (1px solid #FF0000)]
+          RenderBlock (floating) {SPAN} at (0,318) size 38x266 [border: (1px solid #FF0000)]
             RenderText {#text} at (7,1) size 24x119
               text run at (7,1) width 119: "float:right:"
             RenderInline {SPAN} at (0,0) size 24x25
               RenderCombineText {#text} at (7,119) size 24x25
                 text run at (7,119) width 24: "\x{FFFC}"
             RenderText {#text} at (7,143) size 24x25
-              text run at (7,143) width 24: "\x{5E74}"
+              text run at (7,143) width 25: "\x{5E74}"
             RenderInline {SPAN} at (0,0) size 24x25
               RenderCombineText {#text} at (7,167) size 24x25
                 text run at (7,167) width 24: "\x{FFFC}"
-            RenderText {#text} at (7,191) size 24x25
-              text run at (7,191) width 24: "\x{6708}"
+            RenderText {#text} at (7,191) size 24x26
+              text run at (7,191) width 25: "\x{6708}"
             RenderInline {SPAN} at (0,0) size 24x25
-              RenderCombineText {#text} at (7,215) size 24x25
-                text run at (7,215) width 24: "\x{FFFC}"
-            RenderText {#text} at (7,239) size 24x25
-              text run at (7,239) width 24: "\x{65E5}"
-          RenderInline {SPAN} at (0,0) size 209x576
-            RenderText {#text} at (15,0) size 209x576
-              text run at (15,0) width 305: "\x{305D}\x{306E}\x{5973}\x{304C}\x{306D}\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}\x{3001}\x{308F}"
-              text run at (63,0) width 576: "\x{305F}\x{3057}\x{306F}\x{3051}\x{3063}\x{3057}\x{3066}\x{306D}\x{3069}\x{3053}\x{306B}\x{306F}\x{306F}\x{3044}\x{3089}\x{306A}\x{304B}\x{3063}\x{305F}\x{3002}\x{51AC}\x{306E}\x{3042}\x{3089}\x{3057}\x{304C}\x{3060}\x{3093}\x{3054}\x{306E}\x{3088}\x{3046}\x{306A}\x{96EA}\x{3092}\x{3075}"
-              text run at (111,0) width 576: "\x{304D}\x{3064}\x{3051}\x{3066}\x{7A93}\x{30AC}\x{30E9}\x{30B9}\x{3092}\x{767D}\x{304F}\x{3059}\x{308B}\x{3058}\x{3076}\x{3093}\x{306B}\x{306A}\x{308B}\x{3068}\x{3001}\x{3053}\x{306E}\x{5973}\x{306E}\x{4EBA}\x{306F}\x{4E21}\x{624B}\x{306E}\x{9593}\x{306B}\x{308F}\x{305F}\x{3057}\x{306E}"
-              text run at (159,0) width 576: "\x{8DB3}\x{3092}\x{304A}\x{3055}\x{3048}\x{3066}\x{3001}\x{6B4C}\x{3092}\x{6B4C}\x{3044}\x{306A}\x{304C}\x{3089}\x{6696}\x{3081}\x{3066}\x{304F}\x{308C}\x{305F}\x{3002}\x{305D}\x{306E}\x{6B4C}\x{306E}\x{7BC0}\x{3082}\x{6587}\x{53E5}\x{3082}\x{3001}\x{3044}\x{307E}\x{306B}\x{5FD8}\x{308C}"
-              text run at (207,0) width 80: "\x{305A}\x{306B}\x{3044}\x{308B}\x{3002}"
+              RenderCombineText {#text} at (7,216) size 24x25
+                text run at (7,216) width 24: "\x{FFFC}"
+            RenderText {#text} at (7,240) size 24x25
+              text run at (7,240) width 25: "\x{65E5}"
+          RenderInline {SPAN} at (0,0) size 209x581
+            RenderText {#text} at (15,0) size 209x581
+              text run at (15,0) width 307: "\x{305D}\x{306E}\x{5973}\x{304C}\x{306D}\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}\x{3001}\x{308F}"
+              text run at (63,0) width 581: "\x{305F}\x{3057}\x{306F}\x{3051}\x{3063}\x{3057}\x{3066}\x{306D}\x{3069}\x{3053}\x{306B}\x{306F}\x{306F}\x{3044}\x{3089}\x{306A}\x{304B}\x{3063}\x{305F}\x{3002}\x{51AC}\x{306E}\x{3042}\x{3089}\x{3057}\x{304C}\x{3060}\x{3093}\x{3054}\x{306E}\x{3088}\x{3046}\x{306A}\x{96EA}\x{3092}\x{3075}"
+              text run at (111,0) width 581: "\x{304D}\x{3064}\x{3051}\x{3066}\x{7A93}\x{30AC}\x{30E9}\x{30B9}\x{3092}\x{767D}\x{304F}\x{3059}\x{308B}\x{3058}\x{3076}\x{3093}\x{306B}\x{306A}\x{308B}\x{3068}\x{3001}\x{3053}\x{306E}\x{5973}\x{306E}\x{4EBA}\x{306F}\x{4E21}\x{624B}\x{306E}\x{9593}\x{306B}\x{308F}\x{305F}\x{3057}\x{306E}"
+              text run at (159,0) width 581: "\x{8DB3}\x{3092}\x{304A}\x{3055}\x{3048}\x{3066}\x{3001}\x{6B4C}\x{3092}\x{6B4C}\x{3044}\x{306A}\x{304C}\x{3089}\x{6696}\x{3081}\x{3066}\x{304F}\x{308C}\x{305F}\x{3002}\x{305D}\x{306E}\x{6B4C}\x{306E}\x{7BC0}\x{3082}\x{6587}\x{53E5}\x{3082}\x{3001}\x{3044}\x{307E}\x{306B}\x{5FD8}\x{308C}"
+              text run at (207,0) width 81: "\x{305A}\x{306B}\x{3044}\x{308B}\x{3002}"
           RenderText {#text} at (0,0) size 0x0
       RenderBlock (anonymous) at (626,0) size 0x584
         RenderInline {SPAN} at (0,0) size 0x0