Reland of Add code to call skia's matchFamilyStyleCharacter API, which uses the (patchset #…

third_party/WebKit/LayoutTests/platform/win/fast/text/decorations-with-text-combine-expected.txt

Index: third_party/WebKit/LayoutTests/platform/win/fast/text/decorations-with-text-combine-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/decorations-with-text-combine-expected.txt b/third_party/WebKit/LayoutTests/platform/win/fast/text/decorations-with-text-combine-expected.txt
index d5d1b1ef8fe559e205a4a2d6dda0f83d1682fd9f..795a7b024d0624b05f495509427c74a64835ff48 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/decorations-with-text-combine-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/decorations-with-text-combine-expected.txt
@@ -114,40 +114,40 @@ layer at (0,0) size 800x600
               text run at (8,288) width 24: "12345"
           LayoutText {#text} at (8,312) size 26x168
             text run at (8,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
-      LayoutBlockFlow {DIV} at (312,0) size 106x584
-        LayoutBlockFlow {DIV} at (0,0) size 48x584
-          LayoutText {#text} at (14,0) size 26x72
-            text run at (14,0) width 72: "\x{305D}\x{306E}\x{5973}"
-          LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF]
-            LayoutTextCombine {#text} at (14,72) size 26x24
-              text run at (14,72) width 24: "1"
-          LayoutText {#text} at (14,96) size 26x48
-            text run at (14,96) width 48: "\x{304C}\x{306D}"
-          LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF]
-            LayoutTextCombine {#text} at (14,144) size 26x24
-              text run at (14,144) width 24: "123"
-          LayoutText {#text} at (14,168) size 26x120
-            text run at (14,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
-          LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF]
-            LayoutTextCombine {#text} at (14,288) size 26x24
-              text run at (14,288) width 24: "12345"
-          LayoutText {#text} at (14,312) size 26x168
-            text run at (14,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
-        LayoutBlockFlow {DIV} at (58,0) size 48x584
-          LayoutText {#text} at (14,0) size 26x72
-            text run at (14,0) width 72: "\x{305D}\x{306E}\x{5973}"
-          LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF]
-            LayoutTextCombine {#text} at (14,72) size 26x24
-              text run at (14,72) width 24: "1"
-          LayoutText {#text} at (14,96) size 26x48
-            text run at (14,96) width 48: "\x{304C}\x{306D}"
-          LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF]
-            LayoutTextCombine {#text} at (14,144) size 26x24
-              text run at (14,144) width 24: "123"
-          LayoutText {#text} at (14,168) size 26x120
-            text run at (14,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
-          LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF]
-            LayoutTextCombine {#text} at (14,288) size 26x24
-              text run at (14,288) width 24: "12345"
-          LayoutText {#text} at (14,312) size 26x168
-            text run at (14,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
+      LayoutBlockFlow {DIV} at (312,0) size 108x584
+        LayoutBlockFlow {DIV} at (0,0) size 49x584
+          LayoutText {#text} at (15,0) size 26x72
+            text run at (15,0) width 72: "\x{305D}\x{306E}\x{5973}"
+          LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF]
+            LayoutTextCombine {#text} at (15,72) size 26x24
+              text run at (15,72) width 24: "1"
+          LayoutText {#text} at (15,96) size 26x48
+            text run at (15,96) width 48: "\x{304C}\x{306D}"
+          LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF]
+            LayoutTextCombine {#text} at (15,144) size 26x24
+              text run at (15,144) width 24: "123"
+          LayoutText {#text} at (15,168) size 26x120
+            text run at (15,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
+          LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF]
+            LayoutTextCombine {#text} at (15,288) size 26x24
+              text run at (15,288) width 24: "12345"
+          LayoutText {#text} at (15,312) size 26x168
+            text run at (15,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"
+        LayoutBlockFlow {DIV} at (59,0) size 49x584
+          LayoutText {#text} at (15,0) size 26x72
+            text run at (15,0) width 72: "\x{305D}\x{306E}\x{5973}"
+          LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF]
+            LayoutTextCombine {#text} at (15,72) size 26x24
+              text run at (15,72) width 24: "1"
+          LayoutText {#text} at (15,96) size 26x48
+            text run at (15,96) width 48: "\x{304C}\x{306D}"
+          LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF]
+            LayoutTextCombine {#text} at (15,144) size 26x24
+              text run at (15,144) width 24: "123"
+          LayoutText {#text} at (15,168) size 26x120
+            text run at (15,168) width 120: "\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}"
+          LayoutInline {SPAN} at (0,0) size 26x24 [color=#0000FF]
+            LayoutTextCombine {#text} at (15,288) size 26x24
+              text run at (15,288) width 24: "12345"
+          LayoutText {#text} at (15,312) size 26x168
+            text run at (15,312) width 168: "\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}"