Replace SkTypeface::Style with SkFontStyle.
Committed: https://skia.googlesource.com/skia/+/43b8b36b20ae00e2d78421c4cda1f3f922983a20
Review URL: https://codereview.chromium.org/488143002
diff --git a/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json b/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json
index 551b498..c5850aa 100644
--- a/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json
@@ -3302,7 +3302,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 3107305384935863757
+ 18133751285868944069
]
],
"reviewed-by-human": true
@@ -3311,7 +3311,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 12311346928809779354
+ 7429794481924593524
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json b/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json
index c4de5b6..8e0a3f3 100644
--- a/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json
@@ -3302,7 +3302,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 3107305384935863757
+ 18133751285868944069
]
],
"reviewed-by-human": true
@@ -3311,7 +3311,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 12311346928809779354
+ 7429794481924593524
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json b/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json
index e3be443..06eb7d2 100644
--- a/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json
@@ -3351,7 +3351,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 3107305384935863757
+ 18133751285868944069
]
],
"reviewed-by-human": true
@@ -3360,7 +3360,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 12311346928809779354
+ 7429794481924593524
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json b/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json
index e3be443..06eb7d2 100644
--- a/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json
@@ -3351,7 +3351,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 3107305384935863757
+ 18133751285868944069
]
],
"reviewed-by-human": true
@@ -3360,7 +3360,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 12311346928809779354
+ 7429794481924593524
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json b/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json
index 86c2f87..8c9763b 100644
--- a/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json
@@ -3351,7 +3351,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 3107305384935863757
+ 18133751285868944069
]
],
"reviewed-by-human": true
@@ -3360,7 +3360,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 12311346928809779354
+ 7429794481924593524
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Release/expected-results.json b/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Release/expected-results.json
index 86c2f87..8c9763b 100644
--- a/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Release/expected-results.json
@@ -3351,7 +3351,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 3107305384935863757
+ 18133751285868944069
]
],
"reviewed-by-human": true
@@ -3360,7 +3360,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 12311346928809779354
+ 7429794481924593524
]
],
"reviewed-by-human": true