Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(224)

Unified Diff: LayoutTests/platform/win/virtual/slimmingpaint/fast/text/international/text-combine-image-test-expected.txt

Issue 890853002: Revert of text-combine should scale rather than fall back to none when wide (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: LayoutTests/platform/win/virtual/slimmingpaint/fast/text/international/text-combine-image-test-expected.txt
diff --git a/LayoutTests/platform/win/virtual/slimmingpaint/fast/text/international/text-combine-image-test-expected.txt b/LayoutTests/platform/win/virtual/slimmingpaint/fast/text/international/text-combine-image-test-expected.txt
index d1385770ea737fdb5960ef9ce0dce88ccdbdde30..2222f61b90e740fb631395f4adcbd6e82125d2df 100644
--- a/LayoutTests/platform/win/virtual/slimmingpaint/fast/text/international/text-combine-image-test-expected.txt
+++ b/LayoutTests/platform/win/virtual/slimmingpaint/fast/text/international/text-combine-image-test-expected.txt
@@ -11,61 +11,61 @@ layer at (309,0) size 491x600
RenderText {#text} at (0,0) size 0x0
RenderBlock {HR} at (56,0) size 2x584 [border: (1px inset #EEEEEE)]
RenderBlock (anonymous) at (66,0) size 38x584
- RenderInline {SPAN} at (0,0) size 36x371
- RenderInline {SPAN} at (0,0) size 36x32
- RenderCombineText {#text} at (1,0) size 36x32
- text run at (1,0) width 32: "\x{FFFC}"
- RenderText {#text} at (1,32) size 36x83
- text run at (1,32) width 83: "=\x{897F}\x{66A6}"
+ RenderInline {SPAN} at (0,0) size 36x433
+ RenderInline {SPAN} at (0,0) size 36x47
+ RenderCombineText {#text} at (1,0) size 36x47
+ text run at (1,0) width 47: "ON"
+ RenderText {#text} at (1,46) size 36x83
+ text run at (1,46) width 83: "=\x{897F}\x{66A6}"
+ RenderInline {SPAN} at (0,0) size 36x65
+ RenderCombineText {#text} at (1,128) size 36x65
+ text run at (1,128) width 64: "2010"
+ RenderText {#text} at (1,192) size 36x33
+ text run at (1,192) width 32: "\x{5E74}"
RenderInline {SPAN} at (0,0) size 36x33
- RenderCombineText {#text} at (1,114) size 36x33
- text run at (1,114) width 32: "\x{FFFC}"
- RenderText {#text} at (1,146) size 36x33
- text run at (1,146) width 32: "\x{5E74}"
+ RenderCombineText {#text} at (1,224) size 36x33
+ text run at (1,224) width 32: "\x{FFFC}"
+ RenderText {#text} at (1,256) size 36x33
+ text run at (1,256) width 32: "\x{6708}"
RenderInline {SPAN} at (0,0) size 36x33
- RenderCombineText {#text} at (1,178) size 36x33
- text run at (1,178) width 32: "\x{FFFC}"
- RenderText {#text} at (1,210) size 36x33
- text run at (1,210) width 32: "\x{6708}"
- RenderInline {SPAN} at (0,0) size 36x33
- RenderCombineText {#text} at (1,242) size 36x33
- text run at (1,242) width 32: "\x{FFFC}"
- RenderText {#text} at (1,274) size 36x33
- text run at (1,274) width 32: "\x{65E5}"
- RenderInline {SPAN} at (0,0) size 36x33
- RenderCombineText {#text} at (1,306) size 36x33
- text run at (1,306) width 32: "\x{FFFC}"
- RenderText {#text} at (1,338) size 36x33
- text run at (1,338) width 32: "\x{56DE}"
+ RenderCombineText {#text} at (1,288) size 36x33
+ text run at (1,288) width 32: "\x{FFFC}"
+ RenderText {#text} at (1,320) size 36x33
+ text run at (1,320) width 32: "\x{65E5}"
+ RenderInline {SPAN} at (0,0) size 36x49
+ RenderCombineText {#text} at (1,352) size 36x49
+ text run at (1,352) width 48: "365"
+ RenderText {#text} at (1,400) size 36x33
+ text run at (1,400) width 32: "\x{56DE}"
RenderText {#text} at (0,0) size 0x0
RenderBlock {HR} at (112,0) size 2x584 [border: (1px inset #EEEEEE)]
RenderBlock (anonymous) at (122,0) size 38x584
- RenderInline {SPAN} at (0,0) size 36x371
- RenderInline {SPAN} at (0,0) size 36x32
- RenderCombineText {#text} at (1,0) size 36x32
- text run at (1,0) width 32: "\x{FFFC}"
- RenderText {#text} at (1,32) size 36x83
- text run at (1,32) width 83: "=\x{897F}\x{66A6}"
- RenderInline {SPAN} at (0,0) size 36x33
- RenderCombineText {#text} at (1,114) size 36x33
- text run at (1,114) width 32: "\x{FFFC}"
- RenderText {#text} at (1,146) size 36x33
- text run at (1,146) width 32: "\x{5E74}"
+ RenderInline {SPAN} at (0,0) size 36x465
+ RenderInline {SPAN} at (0,0) size 36x79
+ RenderCombineText {#text} at (1,0) size 36x79
+ text run at (1,0) width 79: "Times"
+ RenderText {#text} at (1,78) size 36x83
+ text run at (1,78) width 83: "=\x{897F}\x{66A6}"
+ RenderInline {SPAN} at (0,0) size 36x65
+ RenderCombineText {#text} at (1,160) size 36x65
+ text run at (1,160) width 64: "2010"
+ RenderText {#text} at (1,224) size 36x33
+ text run at (1,224) width 32: "\x{5E74}"
RenderInline {SPAN} at (0,0) size 36x33
- RenderCombineText {#text} at (1,178) size 36x33
- text run at (1,178) width 32: "\x{FFFC}"
- RenderText {#text} at (1,210) size 36x33
- text run at (1,210) width 32: "\x{6708}"
+ RenderCombineText {#text} at (1,256) size 36x33
+ text run at (1,256) width 32: "\x{FFFC}"
+ RenderText {#text} at (1,288) size 36x33
+ text run at (1,288) width 32: "\x{6708}"
RenderInline {SPAN} at (0,0) size 36x33
- RenderCombineText {#text} at (1,242) size 36x33
- text run at (1,242) width 32: "\x{FFFC}"
- RenderText {#text} at (1,274) size 36x33
- text run at (1,274) width 32: "\x{65E5}"
- RenderInline {SPAN} at (0,0) size 36x33
- RenderCombineText {#text} at (1,306) size 36x33
- text run at (1,306) width 32: "\x{FFFC}"
- RenderText {#text} at (1,338) size 36x33
- text run at (1,338) width 32: "\x{56DE}"
+ RenderCombineText {#text} at (1,320) size 36x33
+ text run at (1,320) width 32: "\x{FFFC}"
+ RenderText {#text} at (1,352) size 36x33
+ text run at (1,352) width 32: "\x{65E5}"
+ RenderInline {SPAN} at (0,0) size 36x49
+ RenderCombineText {#text} at (1,384) size 36x49
+ text run at (1,384) width 48: "365"
+ RenderText {#text} at (1,432) size 36x33
+ text run at (1,432) width 32: "\x{56DE}"
RenderText {#text} at (0,0) size 0x0
RenderBlock {HR} at (168,0) size 2x584 [border: (1px inset #EEEEEE)]
RenderBlock (anonymous) at (178,0) size 75x584
@@ -73,55 +73,55 @@ layer at (309,0) size 491x600
RenderText {#text} at (1,0) size 36x223
text run at (1,0) width 223: "OFF=\x{5B57}\x{3042}\x{FF21}A%"
RenderBR {BR} at (10,222) size 17x1
- RenderInline {SPAN} at (0,0) size 36x211
- RenderInline {SPAN} at (0,0) size 36x32
- RenderCombineText {#text} at (38,0) size 36x32
- text run at (38,0) width 32: "\x{FFFC}"
- RenderText {#text} at (38,32) size 36x19
- text run at (38,32) width 19: "="
+ RenderInline {SPAN} at (0,0) size 36x225
+ RenderInline {SPAN} at (0,0) size 36x47
+ RenderCombineText {#text} at (38,0) size 36x47
+ text run at (38,0) width 47: "ON"
+ RenderText {#text} at (38,46) size 36x19
+ text run at (38,46) width 19: "="
RenderInline {SPAN} at (0,0) size 36x33
- RenderCombineText {#text} at (38,50) size 36x33
- text run at (38,50) width 32: "\x{FFFC}"
+ RenderCombineText {#text} at (38,64) size 36x33
+ text run at (38,64) width 32: "\x{FFFC}"
RenderInline {SPAN} at (0,0) size 36x33
- RenderCombineText {#text} at (38,82) size 36x33
- text run at (38,82) width 32: "\x{FFFC}"
+ RenderCombineText {#text} at (38,96) size 36x33
+ text run at (38,96) width 32: "\x{FFFC}"
RenderInline {SPAN} at (0,0) size 36x33
- RenderCombineText {#text} at (38,114) size 36x33
- text run at (38,114) width 32: "\x{FFFC}"
+ RenderCombineText {#text} at (38,128) size 36x33
+ text run at (38,128) width 32: "\x{FFFC}"
RenderInline {SPAN} at (0,0) size 36x33
- RenderCombineText {#text} at (38,146) size 36x33
- text run at (38,146) width 32: "\x{FFFC}"
+ RenderCombineText {#text} at (38,160) size 36x33
+ text run at (38,160) width 32: "\x{FFFC}"
RenderInline {SPAN} at (0,0) size 36x33
- RenderCombineText {#text} at (38,178) size 36x33
- text run at (38,178) width 32: "\x{FFFC}"
+ RenderCombineText {#text} at (38,192) size 36x33
+ text run at (38,192) width 32: "\x{FFFC}"
RenderText {#text} at (0,0) size 0x0
RenderBlock (anonymous) at (269,0) size 182x584
RenderBlock {HR} at (0,0) size 2x584 [border: (1px inset #EEEEEE)]
RenderBlock {P} at (34,0) size 148x584
- RenderBlock (floating) {SPAN} at (0,335.36) size 29x248.64 [border: (1px solid #FF0000)]
+ RenderBlock (floating) {SPAN} at (0,311.36) size 29x272.64 [border: (1px solid #FF0000)]
RenderText {#text} at (1,1) size 26x103
text run at (1,1) width 103: "float:right:"
+ RenderInline {SPAN} at (0,0) size 26x49
+ RenderCombineText {#text} at (1,103) size 26x49
+ text run at (1,103) width 48: "2010"
+ RenderText {#text} at (1,151) size 26x25
+ text run at (1,151) width 24: "\x{5E74}"
RenderInline {SPAN} at (0,0) size 26x25
- RenderCombineText {#text} at (1,103) size 26x25
- text run at (1,103) width 24: "\x{FFFC}"
- RenderText {#text} at (1,127) size 26x25
- text run at (1,127) width 24: "\x{5E74}"
- RenderInline {SPAN} at (0,0) size 26x25
- RenderCombineText {#text} at (1,151) size 26x25
- text run at (1,151) width 24: "\x{FFFC}"
- RenderText {#text} at (1,175) size 26x25
- text run at (1,175) width 24: "\x{6708}"
+ RenderCombineText {#text} at (1,175) size 26x25
+ text run at (1,175) width 24: "\x{FFFC}"
+ RenderText {#text} at (1,199) size 26x25
+ text run at (1,199) width 24: "\x{6708}"
RenderInline {SPAN} at (0,0) size 26x25
- RenderCombineText {#text} at (1,199) size 26x25
- text run at (1,199) width 24: "\x{FFFC}"
- RenderText {#text} at (1,223) size 26x25
- text run at (1,223) width 24: "\x{65E5}"
- RenderInline {SPAN} at (0,0) size 128x583
- RenderText {#text} at (9,0) size 128x583
- text run at (9,0) width 332: "\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}\x{305F}\x{3057}\x{306F}"
- text run at (46,0) width 583: "\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}\x{304D}\x{3064}\x{3051}\x{3066}\x{7A93}\x{30AC}"
- text run at (83,0) width 583: "\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}\x{8DB3}\x{3092}\x{304A}\x{3055}\x{3048}\x{3066}\x{3001}\x{6B4C}"
- text run at (120,0) width 507: "\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}\x{305A}\x{306B}\x{3044}\x{308B}\x{3002}"
+ RenderCombineText {#text} at (1,223) size 26x25
+ text run at (1,223) width 24: "\x{FFFC}"
+ RenderText {#text} at (1,247) size 26x25
+ text run at (1,247) width 24: "\x{65E5}"
+ RenderInline {SPAN} at (0,0) size 128x582
+ RenderText {#text} at (9,0) size 128x582
+ text run at (9,0) width 303: "\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}\x{305F}"
+ text run at (46,0) width 582: "\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}\x{304D}\x{3064}\x{3051}\x{3066}"
+ text run at (83,0) width 568: "\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}\x{8DB3}\x{3092}\x{304A}\x{3055}\x{3048}"
+ text run at (120,0) width 553: "\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}\x{305A}\x{306B}\x{3044}\x{308B}\x{3002}"
RenderText {#text} at (0,0) size 0x0
RenderBlock (anonymous) at (483,0) size 0x584
RenderInline {SPAN} at (0,0) size 0x0

Powered by Google App Engine
This is Rietveld 408576698