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

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

Index: LayoutTests/platform/mac/virtual/slimmingpaint/fast/text/international/text-combine-image-test-expected.txt
diff --git a/LayoutTests/platform/mac/virtual/slimmingpaint/fast/text/international/text-combine-image-test-expected.txt b/LayoutTests/platform/mac/virtual/slimmingpaint/fast/text/international/text-combine-image-test-expected.txt
index c7aeef474901c4baaf3297df66ca3fcb5b9bf837..22cfb631b0152396e8e76064a1c0f95322ae6aed 100644
--- a/LayoutTests/platform/mac/virtual/slimmingpaint/fast/text/international/text-combine-image-test-expected.txt
+++ b/LayoutTests/platform/mac/virtual/slimmingpaint/fast/text/international/text-combine-image-test-expected.txt
@@ -40,32 +40,32 @@ layer at (166,0) size 634x600
         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 32x465
+          RenderInline {SPAN} at (0,0) size 32x79
+            RenderCombineText {#text} at (8,0) size 32x79
+              text run at (8,0) width 79: "Times"
+          RenderText {#text} at (8,78) size 32x83
+            text run at (8,78) width 83: "=\x{897F}\x{66A6}"
+          RenderInline {SPAN} at (0,0) size 32x65
+            RenderCombineText {#text} at (8,160) size 32x65
+              text run at (8,160) width 64: "2010"
+          RenderText {#text} at (8,224) size 32x33
+            text run at (8,224) width 32: "\x{5E74}"
           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}"
+            RenderCombineText {#text} at (8,256) size 32x33
+              text run at (8,256) width 32: "\x{FFFC}"
+          RenderText {#text} at (8,288) size 32x33
+            text run at (8,288) width 32: "\x{6708}"
           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}"
+            RenderCombineText {#text} at (8,320) size 32x33
+              text run at (8,320) width 32: "\x{FFFC}"
+          RenderText {#text} at (8,352) size 32x33
+            text run at (8,352) width 32: "\x{65E5}"
+          RenderInline {SPAN} at (0,0) size 32x49
+            RenderCombineText {#text} at (8,384) size 32x49
+              text run at (8,384) width 48: "365"
+          RenderText {#text} at (8,432) size 32x33
+            text run at (8,432) 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