Rebaselines for 6bc2c94de33 (fontmgr_iter).

Rebaselines for "Add font fallback support to SkFontMgr_fontconfig."

13 files changed, 38 insertions, 40 deletions

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 962dd3a6ce..01a48cb540 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
@@ -3272,7 +3272,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7908130939460093017
+          3107305384935863757
         ]
       ], 
       "reviewed-by-human": true
@@ -3281,7 +3281,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4300370831575263679
+          12311346928809779354
         ]
       ], 
       "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 700812d57b..269a695ce9 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
@@ -3272,7 +3272,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7908130939460093017
+          3107305384935863757
         ]
       ], 
       "reviewed-by-human": true
@@ -3281,7 +3281,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4300370831575263679
+          12311346928809779354
         ]
       ], 
       "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 66c57ce8a3..3f026baa7b 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
@@ -3321,7 +3321,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7908130939460093017
+          3107305384935863757
         ]
       ], 
       "reviewed-by-human": true
@@ -3330,7 +3330,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4300370831575263679
+          12311346928809779354
         ]
       ], 
       "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 66c57ce8a3..3f026baa7b 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
@@ -3321,7 +3321,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7908130939460093017
+          3107305384935863757
         ]
       ], 
       "reviewed-by-human": true
@@ -3330,7 +3330,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4300370831575263679
+          12311346928809779354
         ]
       ], 
       "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 6ea2b5a8d4..c99f0af6a1 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
@@ -3321,7 +3321,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7908130939460093017
+          3107305384935863757
         ]
       ], 
       "reviewed-by-human": true
@@ -3330,7 +3330,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4300370831575263679
+          12311346928809779354
         ]
       ], 
       "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 6ea2b5a8d4..c99f0af6a1 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
@@ -3321,7 +3321,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7908130939460093017
+          3107305384935863757
         ]
       ], 
       "reviewed-by-human": true
@@ -3330,7 +3330,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4300370831575263679
+          12311346928809779354
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json
index abce9713ba..c3bcb3f776 100644
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json
@@ -9797,7 +9797,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5532193327210681882
+          8941245033428719604
         ]
       ], 
       "reviewed-by-human": true
@@ -9806,7 +9806,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8553416758363914294
+          14135920799259443071
         ]
       ], 
       "reviewed-by-human": true
@@ -9815,7 +9815,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4160702815259466556
+          7771644967924691504
         ]
       ], 
       "reviewed-by-human": true
@@ -9824,7 +9824,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4160702815259466556
+          7771644967924691504
         ]
       ], 
       "reviewed-by-human": true
@@ -9833,7 +9833,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          833164447570626967
+          6255857682785307937
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json
index 049eb2e4db..95f09c9d10 100644
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json
@@ -9929,7 +9929,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5532193327210681882
+          8941245033428719604
         ]
       ], 
       "reviewed-by-human": true
@@ -9938,7 +9938,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8553416758363914294
+          14135920799259443071
         ]
       ], 
       "reviewed-by-human": true
@@ -9947,7 +9947,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4160702815259466556
+          7771644967924691504
         ]
       ], 
       "reviewed-by-human": true
@@ -9956,7 +9956,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4160702815259466556
+          7771644967924691504
         ]
       ], 
       "reviewed-by-human": true
@@ -9965,7 +9965,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          833164447570626967
+          6255857682785307937
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug/expected-results.json
index 62a9a85613..9d1da05b18 100644
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug/expected-results.json
@@ -9880,7 +9880,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5532193327210681882
+          8941245033428719604
         ]
       ], 
       "reviewed-by-human": true
@@ -9889,7 +9889,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8553416758363914294
+          14135920799259443071
         ]
       ], 
       "reviewed-by-human": true
@@ -9898,7 +9898,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4160702815259466556
+          7771644967924691504
         ]
       ], 
       "reviewed-by-human": true
@@ -9907,7 +9907,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4160702815259466556
+          7771644967924691504
         ]
       ], 
       "reviewed-by-human": true
@@ -9916,7 +9916,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          833164447570626967
+          7674289571277755921
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/expected-results.json
index 33344cc58d..fee9e84eb6 100644
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/expected-results.json
@@ -9884,7 +9884,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5532193327210681882
+          8941245033428719604
         ]
       ], 
       "reviewed-by-human": true
@@ -9893,7 +9893,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8553416758363914294
+          14135920799259443071
         ]
       ], 
       "reviewed-by-human": true
@@ -9902,7 +9902,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4160702815259466556
+          7771644967924691504
         ]
       ], 
       "reviewed-by-human": true
@@ -9911,7 +9911,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4160702815259466556
+          7771644967924691504
         ]
       ], 
       "reviewed-by-human": true
@@ -9920,7 +9920,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          833164447570626967
+          7674289571277755921
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug-Recipes/expected-results.json b/expectations/gm/Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug-Recipes/expected-results.json
index 6559554794..b210bc491d 100644
--- a/expectations/gm/Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug-Recipes/expected-results.json
+++ b/expectations/gm/Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug-Recipes/expected-results.json
@@ -3055,19 +3055,19 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8902265261546230747
+          3439736162679063809
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "fontmgr_iter_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6089254836638034865
+          15589891711481242151
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "fontmgr_match_565.png": {
       "allowed-digests": [
diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE/expected-results.json
index 76e7d48fcc..818006d814 100644
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE/expected-results.json
@@ -7927,11 +7927,11 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10005787191304110747
+          7775298570096891696
         ]
       ], 
       "ignore-failure": true, 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "fontmgr_iter_factory_565.png": {
       "allowed-digests": [
diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt
index f1c74cccca..ad56781c99 100644
--- a/expectations/gm/ignored-tests.txt
+++ b/expectations/gm/ignored-tests.txt
@@ -36,5 +36,3 @@
 # jvanverth
 fontcache
 
-#bungeman
-fontmgr_iter