Rebaseline dftext GM for new color emoji test.

BUG=skia:3033
TBR=mtklein@google.com

Review URL: https://codereview.chromium.org/671513007

35 files changed, 56 insertions, 59 deletions

diff --git a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
index 55f1cb1a98..82b83ba681 100644
--- a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
@@ -4472,7 +4472,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7407610257459501347
+          12120194717814038919
         ]
       ], 
       "reviewed-by-human": true
@@ -4481,7 +4481,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7407610257459501347
+          12120194717814038919
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
index 09697c3229..c191293b7f 100644
--- a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
@@ -4472,7 +4472,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7407610257459501347
+          12120194717814038919
         ]
       ], 
       "reviewed-by-human": true
@@ -4481,7 +4481,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7407610257459501347
+          12120194717814038919
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Debug/expected-results.json
index 29edef9f91..93c8712f87 100644
--- a/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Debug/expected-results.json
@@ -3518,7 +3518,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5920427712190873804
+          13979069549328260173
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Release/expected-results.json
index 29edef9f91..93c8712f87 100644
--- a/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Release/expected-results.json
@@ -3518,7 +3518,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5920427712190873804
+          13979069549328260173
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
index 19e0cf217a..4346763ad0 100644
--- a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
@@ -3355,7 +3355,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2529435051984726471
+          12256923144406369529
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
index 19e0cf217a..4346763ad0 100644
--- a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
@@ -3355,7 +3355,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2529435051984726471
+          12256923144406369529
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-Reference-Unknown-Arm64-Debug/expected-results.json b/expectations/gm/Test-Android-Reference-Unknown-Arm64-Debug/expected-results.json
index 252774fc61..e34b68cded 100644
--- a/expectations/gm/Test-Android-Reference-Unknown-Arm64-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Reference-Unknown-Arm64-Debug/expected-results.json
@@ -3055,7 +3055,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3267278486271418277
+          9180073237356391325
         ]
       ], 
       "reviewed-by-human": true
@@ -3064,7 +3064,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3267278486271418277
+          9180073237356391325
         ]
       ], 
       "reviewed-by-human": true
@@ -3073,7 +3073,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5234606089072799054
+          9180073237356391325
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-Reference-Unknown-Arm64-Release/expected-results.json b/expectations/gm/Test-Android-Reference-Unknown-Arm64-Release/expected-results.json
index c1490e12a4..0bd4a8994c 100644
--- a/expectations/gm/Test-Android-Reference-Unknown-Arm64-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Reference-Unknown-Arm64-Release/expected-results.json
@@ -3055,7 +3055,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3267278486271418277
+          9180073237356391325
         ]
       ], 
       "reviewed-by-human": true
@@ -3064,7 +3064,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3267278486271418277
+          9180073237356391325
         ]
       ], 
       "reviewed-by-human": true
@@ -3073,7 +3073,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5234606089072799054
+          9180073237356391325
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
index ffdac76310..c397ef71a1 100644
--- a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
@@ -3391,7 +3391,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1095761758860550029
+          12104223947422972610
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
index 50a0a6808d..b916c29b2f 100644
--- a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
@@ -3391,7 +3391,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1095761758860550029
+          12104223947422972610
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
index 45b2de567d..2aab036188 100644
--- a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
@@ -6251,7 +6251,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16986060658025092649
+          15368397682145742750
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
index a8d34fdd29..a0b56710da 100644
--- a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
@@ -5266,7 +5266,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16986060658025092649
+          15368397682145742750
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
index 3865d741ef..3217b7b9ad 100644
--- a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
@@ -6599,7 +6599,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10340448019064421473
+          2356800337575111065
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
index 392398fec6..f2d067c906 100644
--- a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
@@ -5642,7 +5642,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10340448019064421473
+          2356800337575111065
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
index cdb6322779..8b259b1c62 100644
--- a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
@@ -6193,7 +6193,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17014969767267941500
+          2611593041111821207
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
index 25b9279576..f3401c1029 100644
--- a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
@@ -6220,7 +6220,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17014969767267941500
+          2611593041111821207
         ]
       ], 
       "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 d5c6ec6649..50bdfcadef 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
@@ -7139,7 +7139,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13177919726042340145
+          11973027603463919319
         ]
       ], 
       "reviewed-by-human": true
@@ -7148,7 +7148,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13177919726042340145
+          11973027603463919319
         ]
       ], 
       "reviewed-by-human": true
@@ -7157,7 +7157,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15175122503063611537
+          8116396743740730019
         ]
       ], 
       "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 45d6b385a4..444623394a 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
@@ -7145,7 +7145,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13177919726042340145
+          11973027603463919319
         ]
       ], 
       "reviewed-by-human": true
@@ -7154,7 +7154,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13177919726042340145
+          11973027603463919319
         ]
       ], 
       "reviewed-by-human": true
@@ -7163,7 +7163,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15175122503063611537
+          8116396743740730019
         ]
       ], 
       "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 4fcba120c1..42e9b70bec 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
@@ -7225,7 +7225,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13177919726042340145
+          11973027603463919319
         ]
       ], 
       "reviewed-by-human": true
@@ -7234,7 +7234,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13177919726042340145
+          11973027603463919319
         ]
       ], 
       "reviewed-by-human": true
@@ -7243,7 +7243,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15175122503063611537
+          8116396743740730019
         ]
       ], 
       "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 b63455bb47..b1a19a2703 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
@@ -7229,7 +7229,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13177919726042340145
+          11973027603463919319
         ]
       ], 
       "reviewed-by-human": true
@@ -7238,7 +7238,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13177919726042340145
+          11973027603463919319
         ]
       ], 
       "reviewed-by-human": true
@@ -7247,7 +7247,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15175122503063611537
+          8116396743740730019
         ]
       ], 
       "reviewed-by-human": true
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 db34cb359b..1e10031c52 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
@@ -5839,7 +5839,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14168152538103472428
+          7222922996937022671
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
index 93afc7574c..4febdd60e3 100644
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
@@ -4744,7 +4744,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14282237189851520094
+          10837048940248383878
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json
index abd4172118..6eade37976 100644
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json
@@ -5839,7 +5839,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14168152538103472428
+          7222922996937022671
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
index 4b194ff180..91fc8c25c3 100644
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
@@ -4493,7 +4493,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14401469220043265626
+          8613974910934085796
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json
index 792cf146cb..94f90748bf 100644
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json
@@ -4745,7 +4745,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14282237189851520094
+          10837048940248383878
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json
index 792cf146cb..94f90748bf 100644
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json
@@ -4745,7 +4745,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14282237189851520094
+          10837048940248383878
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json
index 7fd7c6ebd9..9c55eff6b8 100644
--- a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json
@@ -7211,7 +7211,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15879576109198041747
+          7017228876285160592
         ]
       ], 
       "reviewed-by-human": true
@@ -7220,7 +7220,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15879576109198041747
+          7017228876285160592
         ]
       ], 
       "reviewed-by-human": true
@@ -7229,7 +7229,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17538572836065243461
+          2346383802474177735
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json
index 5c2ae6028d..c7800c95fd 100644
--- a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json
@@ -7211,7 +7211,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15879576109198041747
+          7017228876285160592
         ]
       ], 
       "reviewed-by-human": true
@@ -7220,7 +7220,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15879576109198041747
+          7017228876285160592
         ]
       ], 
       "reviewed-by-human": true
@@ -7229,7 +7229,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17538572836065243461
+          2346383802474177735
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Debug/expected-results.json b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Debug/expected-results.json
index cd99f55cc6..8b3d96a5b3 100644
--- a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Debug/expected-results.json
@@ -7211,7 +7211,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15879576109198041747
+          7017228876285160592
         ]
       ], 
       "reviewed-by-human": true
@@ -7220,7 +7220,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15879576109198041747
+          7017228876285160592
         ]
       ], 
       "reviewed-by-human": true
@@ -7229,7 +7229,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17538572836065243461
+          2346383802474177735
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Release/expected-results.json b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Release/expected-results.json
index 317fc41e8c..755c0f11dc 100644
--- a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Release/expected-results.json
@@ -7211,7 +7211,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15879576109198041747
+          7017228876285160592
         ]
       ], 
       "reviewed-by-human": true
@@ -7220,7 +7220,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15879576109198041747
+          7017228876285160592
         ]
       ], 
       "reviewed-by-human": true
@@ -7229,7 +7229,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17538572836065243461
+          2346383802474177735
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Debug/expected-results.json b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Debug/expected-results.json
index a659b530e6..4988581912 100644
--- a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Debug/expected-results.json
@@ -4930,7 +4930,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15452828897744721699
+          11691506632178565894
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Release/expected-results.json b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Release/expected-results.json
index 954959b90a..458354f8fa 100644
--- a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Release/expected-results.json
@@ -4930,7 +4930,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15452828897744721699
+          11691506632178565894
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86_64-Debug/expected-results.json b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86_64-Debug/expected-results.json
index 05e9dfb4b4..de52826391 100644
--- a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86_64-Debug/expected-results.json
@@ -4930,7 +4930,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15452828897744721699
+          11691506632178565894
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86_64-Release/expected-results.json b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86_64-Release/expected-results.json
index 05e9dfb4b4..de52826391 100644
--- a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86_64-Release/expected-results.json
@@ -4930,7 +4930,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15452828897744721699
+          11691506632178565894
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt
index 5f16953307..5cd4f6b909 100644
--- a/expectations/gm/ignored-tests.txt
+++ b/expectations/gm/ignored-tests.txt
@@ -55,9 +55,6 @@ megalooper_1x4
 megalooper_4x1
 imagefiltersbase
 
-# jvanverth - adding color emoji to df text
-dftext
-
 # senorblanco https://codereview.chromium.org/644323006/
 # PDF backend now supports image filters
 bitmapsource