Revert of text-combine should scale rather than fall back to none when wide

LayoutTests/platform/mac/fast/text/international/text-combine-image-test-expected.txt

 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (166,0) size 634x600
   RenderBlock {HTML} at (0,0) size 634x600
     RenderBody {BODY} at (8,8) size 594x584
       RenderBlock {HR} at (0,0) size 2x584 [border: (1px inset #EEEEEE)]
       RenderBlock (anonymous) at (10,0) size 48x584
         RenderInline {SPAN} at (0,0) size 32x466
           RenderText {#text} at (8,0) size 32x466
             text run at (8,0) width 466: "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 #EEEEEE)]
       RenderBlock (anonymous) at (76,0) size 48x584
-        RenderInline {SPAN} at (0,0) size 32x374
+        RenderInline {SPAN} at (0,0) size 32x442
           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}"
+          RenderInline {SPAN} at (0,0) size 32x76
+            RenderCombineText {#text} at (8,117) size 32x76
+              text run at (8,117) width 76: "2010"
+          RenderText {#text} at (8,192) size 32x33
+            text run at (8,192) width 32: "\x{5E74}"
           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,224) size 32x33
+              text run at (8,224) width 32: "\x{FFFC}"
+          RenderText {#text} at (8,256) size 32x33
+            text run at (8,256) width 32: "\x{6708}"
           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}"
-          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}"
-          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,288) size 32x33
+              text run at (8,288) width 32: "\x{FFFC}"
+          RenderText {#text} at (8,320) size 32x33
+            text run at (8,320) width 32: "\x{65E5}"
+          RenderInline {SPAN} at (0,0) size 32x58
+            RenderCombineText {#text} at (8,352) size 32x58
+              text run at (8,352) width 57: "365"
+          RenderText {#text} at (8,409) size 32x33
+            text run at (8,409) width 32: "\x{56DE}"
         RenderText {#text} at (0,0) size 0x0
       RenderBlock {HR} at (132,0) size 2x584 [border: (1px inset #EEEEEE)]
       RenderBlock (anonymous) at (142,0) size 48x584
-        RenderInline {SPAN} at (0,0) size 32x371
-          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 32x83
-            text run at (8,32) width 83: "=\x{897F}\x{66A6}"
-          RenderInline {SPAN} at (0,0) size 32x33
-            RenderCombineText {#text} at (8,114) size 32x33
-              text run at (8,114) width 32: "\x{FFFC}"
-          RenderText {#text} at (8,146) size 32x33
-            text run at (8,146) width 32: "\x{5E74}"
-          RenderInline {SPAN} at (0,0) size 32x33
-            RenderCombineText {#text} at (8,178) size 32x33
-              text run at (8,178) width 32: "\x{FFFC}"
-          RenderText {#text} at (8,210) size 32x33
-            text run at (8,210) width 32: "\x{6708}"
-          RenderInline {SPAN} at (0,0) size 32x33
-            RenderCombineText {#text} at (8,242) size 32x33
-              text run at (8,242) width 32: "\x{FFFC}"
-          RenderText {#text} at (8,274) size 32x33
-            text run at (8,274) width 32: "\x{65E5}"
-          RenderInline {SPAN} at (0,0) size 32x33
-            RenderCombineText {#text} at (8,306) size 32x33
-              text run at (8,306) width 32: "\x{FFFC}"
-          RenderText {#text} at (8,338) size 32x33
-            text run at (8,338) width 32: "\x{56DE}"
+        RenderInline {SPAN} at (0,0) size 37x466
+          RenderInline {SPAN} at (0,0) size 37x80
+            RenderCombineText {#text} at (5,0) size 37x80
+              text run at (5,0) width 80: "Times"
+          RenderText {#text} at (5,80) size 37x82
+            text run at (5,80) width 82: "=\x{897F}\x{66A6}"
+          RenderInline {SPAN} at (0,0) size 37x64
+            RenderCombineText {#text} at (5,162) size 37x64
+              text run at (5,162) width 64: "2010"
+          RenderText {#text} at (5,226) size 37x32
+            text run at (5,226) width 32: "\x{5E74}"
+          RenderInline {SPAN} at (0,0) size 37x32
+            RenderCombineText {#text} at (5,258) size 37x32
+              text run at (5,258) width 32: "\x{FFFC}"
+          RenderText {#text} at (5,290) size 37x32
+            text run at (5,290) width 32: "\x{6708}"
+          RenderInline {SPAN} at (0,0) size 37x32
+            RenderCombineText {#text} at (5,322) size 37x32
+              text run at (5,322) width 32: "\x{FFFC}"
+          RenderText {#text} at (5,354) size 37x32
+            text run at (5,354) width 32: "\x{65E5}"
+          RenderInline {SPAN} at (0,0) size 37x48
+            RenderCombineText {#text} at (5,386) size 37x48
+              text run at (5,386) width 48: "365"
+          RenderText {#text} at (5,434) size 37x32
+            text run at (5,434) width 32: "\x{56DE}"
         RenderText {#text} at (0,0) size 0x0
       RenderBlock {HR} at (198,0) size 2x584 [border: (1px inset #EEEEEE)]
       RenderBlock (anonymous) at (208,0) size 96x584
         RenderInline {SPAN} at (0,0) size 32x232
           RenderText {#text} at (8,0) size 32x232
             text run at (8,0) width 232: "OFF=\x{5B57}\x{3042}\x{FF21}A%"
-        RenderBR {BR} at (16,231) size 16x1
+        RenderBR {BR} at (15,231) size 18x1
         RenderInline {SPAN} at (0,0) size 32x214
           RenderInline {SPAN} at (0,0) size 32x32
             RenderCombineText {#text} at (56,0) size 32x32
               text run at (56,0) width 32: "\x{FFFC}"
           RenderText {#text} at (56,32) size 32x22
             text run at (56,32) width 22: "="
           RenderInline {SPAN} at (0,0) size 32x33
             RenderCombineText {#text} at (56,53) size 32x33
               text run at (56,53) width 32: "\x{FFFC}"
           RenderInline {SPAN} at (0,0) size 32x33
             RenderCombineText {#text} at (56,85) size 32x33
               text run at (56,85) width 32: "\x{FFFC}"
           RenderInline {SPAN} at (0,0) size 32x33
             RenderCombineText {#text} at (56,117) size 32x33
               text run at (56,117) width 32: "\x{FFFC}"
           RenderInline {SPAN} at (0,0) size 32x33
             RenderCombineText {#text} at (56,149) size 32x33
               text run at (56,149) width 32: "\x{FFFC}"
           RenderInline {SPAN} at (0,0) size 32x33
             RenderCombineText {#text} at (56,181) size 32x33
               text run at (56,181) width 32: "\x{FFFC}"
           RenderText {#text} at (0,0) size 0x0
       RenderBlock (anonymous) at (320,0) size 274x584
         RenderBlock {HR} at (0,0) size 2x584 [border: (1px inset #EEEEEE)]
         RenderBlock {P} at (34,0) size 240x584
-          RenderBlock (floating) {SPAN} at (0,321.27) size 38x262.73 [border: (1px solid #FF0000)]
-            RenderText {#text} at (7,1) size 24x117
-              text run at (7,1) width 117: "float:right:"
+          RenderBlock (floating) {SPAN} at (0,287.70) size 74x296.30 [border: (1px solid #FF0000)]
+            RenderText {#text} at (7,1) size 24x118
+              text run at (7,1) width 118: "float:right:"
+            RenderInline {SPAN} at (0,0) size 24x58
+              RenderCombineText {#text} at (7,118) size 24x58
+                text run at (7,118) width 57: "2010"
+            RenderText {#text} at (7,175) size 24x25
+              text run at (7,175) width 24: "\x{5E74}"
             RenderInline {SPAN} at (0,0) size 24x25
-              RenderCombineText {#text} at (7,117) size 24x25
-                text run at (7,117) width 24: "\x{FFFC}"
-            RenderText {#text} at (7,141) size 24x25
-              text run at (7,141) width 24: "\x{5E74}"
-            RenderInline {SPAN} at (0,0) size 24x25
-              RenderCombineText {#text} at (7,165) size 24x25
-                text run at (7,165) width 24: "\x{FFFC}"
-            RenderText {#text} at (7,189) size 24x25
-              text run at (7,189) width 24: "\x{6708}"
-            RenderInline {SPAN} at (0,0) size 24x25
-              RenderCombineText {#text} at (7,213) size 24x25
-                text run at (7,213) width 24: "\x{FFFC}"
-            RenderText {#text} at (7,237) size 24x25
-              text run at (7,237) width 24: "\x{65E5}"
-          RenderInline {SPAN} at (0,0) size 208x576
-            RenderText {#text} at (16,0) size 208x576
-              text run at (16,0) width 320: "\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 (64,0) width 576: "\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}"
-              text run at (112,0) width 576: "\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}\x{8DB3}"
-              text run at (160,0) width 576: "\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}\x{305A}"
-              text run at (208,0) width 64: "\x{306B}\x{3044}\x{308B}\x{3002}"
+              RenderCombineText {#text} at (7,199) size 24x25
+                text run at (7,199) width 24: "\x{FFFC}"
+            RenderText {#text} at (7,223) size 24x25
+              text run at (7,223) width 24: "\x{6708}"
+            RenderInline {SPAN} at (0,0) size 24x24
+              RenderCombineText {#text} at (43,1) size 24x24
+                text run at (43,1) width 24: "\x{FFFC}"
+            RenderText {#text} at (43,25) size 24x24
+              text run at (43,25) width 24: "\x{65E5}"
+          RenderInline {SPAN} at (0,0) size 209x576
+            RenderText {#text} at (15,0) size 209x576
+              text run at (15,0) width 256: "\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}"
+              text run at (63,0) width 272: "\x{3067}\x{3001}\x{308F}\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}"
+              text run at (111,0) width 576: "\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}\x{30E9}\x{30B9}\x{3092}\x{767D}\x{304F}\x{3059}\x{308B}\x{3058}"
+              text run at (159,0) width 576: "\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}\x{3092}\x{6B4C}\x{3044}\x{306A}\x{304C}\x{3089}"
+              text run at (207,0) width 432: "\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 (626,0) size 0x584
         RenderInline {SPAN} at (0,0) size 0x0