rebase and update ignores

NOTRY=True
TBR=
BUG=skia:

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

36 files changed, 138 insertions, 176 deletions

diff --git a/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Debug/expected-results.json
index a762d09194..4a7a5d4ef0 100644
--- a/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Debug/expected-results.json
@@ -623,7 +623,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10437060912450368441
+          776288504018548234
         ]
       ], 
       "reviewed-by-human": true
@@ -632,7 +632,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12642240258400492093
+          7794284012930777741
         ]
       ], 
       "reviewed-by-human": true
@@ -1941,7 +1941,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7745520020256218003
+          7643952150022138398
         ]
       ], 
       "reviewed-by-human": true
@@ -8788,7 +8788,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16908855341511877329
+          5588342012938239581
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Release/expected-results.json
index b4a89ac42d..c39a7925a6 100644
--- a/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Release/expected-results.json
@@ -623,7 +623,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10437060912450368441
+          776288504018548234
         ]
       ], 
       "reviewed-by-human": true
@@ -1941,7 +1941,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7745520020256218003
+          7643952150022138398
         ]
       ], 
       "reviewed-by-human": true
@@ -8783,7 +8783,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16908855341511877329
+          5588342012938239581
         ]
       ], 
       "reviewed-by-human": true
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 e28fee3aa5..953e059b2d 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
@@ -548,7 +548,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17528752035271916630
+          11110071386674013004
         ]
       ], 
       "reviewed-by-human": true
@@ -2949,7 +2949,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          158195814517883351
+          2329365115116096288
         ]
       ], 
       "reviewed-by-human": true
@@ -14718,7 +14718,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5360500678084590748
+          18350933191220241020
         ]
       ], 
       "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 d566e433f6..98701cd3df 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
@@ -445,7 +445,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17528752035271916630
+          11110071386674013004
         ]
       ], 
       "reviewed-by-human": true
@@ -2711,7 +2711,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          158195814517883351
+          2329365115116096288
         ]
       ], 
       "reviewed-by-human": true
@@ -12312,7 +12312,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5360500678084590748
+          18350933191220241020
         ]
       ], 
       "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 c1a407ecb2..6ec751c8cb 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
@@ -2123,7 +2123,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9641246636600586865
+          1687637915302508719
         ]
       ], 
       "reviewed-by-human": true
@@ -9460,7 +9460,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17708088069112361179
+          9992687294894847032
         ]
       ], 
       "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 c1a407ecb2..6ec751c8cb 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
@@ -2123,7 +2123,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9641246636600586865
+          1687637915302508719
         ]
       ], 
       "reviewed-by-human": true
@@ -9460,7 +9460,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17708088069112361179
+          9992687294894847032
         ]
       ], 
       "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 a619732c6f..3420d336e9 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
@@ -2042,7 +2042,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15477254742759075309
+          1845313719367510354
         ]
       ], 
       "reviewed-by-human": true
@@ -9161,7 +9161,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10069358283928401947
+          4847078710324696151
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Release/expected-results.json b/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Release/expected-results.json
index 021617999f..681b83fe4c 100644
--- a/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Release/expected-results.json
@@ -1183,7 +1183,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12624863915440686736
+          9983105971613979552
         ]
       ], 
       "reviewed-by-human": true
@@ -1192,7 +1192,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16569869274475548824
+          15461221765652733340
         ]
       ], 
       "reviewed-by-human": true
@@ -1201,7 +1201,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5272469947522392970
+          9983105971613979552
         ]
       ], 
       "reviewed-by-human": true
@@ -12176,7 +12176,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3196650548285977166
+          3623246996228398253
         ]
       ], 
       "reviewed-by-human": true
@@ -12185,7 +12185,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11504299822100144685
+          16587669253360143137
         ]
       ], 
       "reviewed-by-human": true
@@ -12194,7 +12194,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4323854140016112056
+          3623246996228398253
         ]
       ], 
       "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 e93cac25ba..e377620ffb 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
@@ -2080,7 +2080,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15477254742759075309
+          1845313719367510354
         ]
       ], 
       "reviewed-by-human": true
@@ -9203,7 +9203,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10069358283928401947
+          4847078710324696151
         ]
       ], 
       "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 06b4af0751..7ae18ee3d5 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
@@ -2080,7 +2080,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15477254742759075309
+          1845313719367510354
         ]
       ], 
       "reviewed-by-human": true
@@ -9203,7 +9203,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10069358283928401947
+          4847078710324696151
         ]
       ], 
       "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 679518d283..38d5a5c7bb 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
@@ -3649,7 +3649,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12624863915440686736
+          9664443624377272600
         ]
       ], 
       "reviewed-by-human": true
@@ -16512,7 +16512,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11427030262920236288
+          17763788251281759441
         ]
       ], 
       "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 b7e0871d89..08af98c9b5 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
@@ -2977,7 +2977,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12624863915440686736
+          9664443624377272600
         ]
       ], 
       "reviewed-by-human": true
@@ -14527,7 +14527,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11427030262920236288
+          17763788251281759441
         ]
       ], 
       "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 7d3162e950..d93e5f4ccb 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
@@ -3988,7 +3988,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12624863915440686736
+          10508112059489141815
         ]
       ], 
       "reviewed-by-human": true
@@ -16983,7 +16983,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11427030262920236288
+          17763788251281759441
         ]
       ], 
       "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 42953b5a71..5e60725fe6 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
@@ -3328,7 +3328,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12624863915440686736
+          10508112059489141815
         ]
       ], 
       "reviewed-by-human": true
@@ -15016,7 +15016,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11427030262920236288
+          17763788251281759441
         ]
       ], 
       "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 270d6550a9..2c35360628 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
@@ -3715,7 +3715,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12624863915440686736
+          10508112059489141815
         ]
       ], 
       "reviewed-by-human": true
@@ -15850,7 +15850,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11427030262920236288
+          17763788251281759441
         ]
       ], 
       "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 9aaf29d31e..90d5fcc541 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
@@ -3685,7 +3685,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12624863915440686736
+          10508112059489141815
         ]
       ], 
       "reviewed-by-human": true
@@ -17071,7 +17071,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11427030262920236288
+          17763788251281759441
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Mac10.9-MacMini6.2-HD4000-x86_64-Debug/expected-results.json b/expectations/gm/Test-Mac10.9-MacMini6.2-HD4000-x86_64-Debug/expected-results.json
index 76e48cc493..f8a4772f36 100644
--- a/expectations/gm/Test-Mac10.9-MacMini6.2-HD4000-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.9-MacMini6.2-HD4000-x86_64-Debug/expected-results.json
@@ -3735,7 +3735,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7048546964514197209
+          1324649194323874631
         ]
       ], 
       "reviewed-by-human": true
@@ -15613,7 +15613,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7528118218484535186
+          15551008691884661168
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Mac10.9-MacMini6.2-HD4000-x86_64-Release/expected-results.json b/expectations/gm/Test-Mac10.9-MacMini6.2-HD4000-x86_64-Release/expected-results.json
index 3ccf7956f6..ffc57bcd43 100644
--- a/expectations/gm/Test-Mac10.9-MacMini6.2-HD4000-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.9-MacMini6.2-HD4000-x86_64-Release/expected-results.json
@@ -3705,7 +3705,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7048546964514197209
+          1324649194323874631
         ]
       ], 
       "reviewed-by-human": true
@@ -16831,7 +16831,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7528118218484535186
+          15551008691884661168
         ]
       ], 
       "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 83738ca720..8951ea8f71 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
@@ -4262,7 +4262,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12624863915440686736
+          9983105971613979552
         ]
       ], 
       "reviewed-by-human": true
@@ -4271,7 +4271,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7558753041292568070
+          17270370206570728368
         ]
       ], 
       "reviewed-by-human": true
@@ -4280,7 +4280,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12624863915440686736
+          9983105971613979552
         ]
       ], 
       "reviewed-by-human": true
@@ -19364,7 +19364,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3196650548285977166
+          1096193628485565598
         ]
       ], 
       "reviewed-by-human": true
@@ -19373,7 +19373,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11504299822100144685
+          4175065946076041612
         ]
       ], 
       "reviewed-by-human": true
@@ -19382,7 +19382,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4323854140016112056
+          1096193628485565598
         ]
       ], 
       "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 fc18f45a8e..ad38df55d3 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
@@ -4261,7 +4261,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12624863915440686736
+          9983105971613979552
         ]
       ], 
       "reviewed-by-human": true
@@ -4270,7 +4270,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7558753041292568070
+          17270370206570728368
         ]
       ], 
       "reviewed-by-human": true
@@ -4279,7 +4279,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12624863915440686736
+          9983105971613979552
         ]
       ], 
       "reviewed-by-human": true
@@ -19598,7 +19598,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3196650548285977166
+          1096193628485565598
         ]
       ], 
       "reviewed-by-human": true
@@ -19607,7 +19607,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11504299822100144685
+          4175065946076041612
         ]
       ], 
       "reviewed-by-human": true
@@ -19616,7 +19616,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4323854140016112056
+          1096193628485565598
         ]
       ], 
       "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 61ef338fb5..7754dd717a 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
@@ -4315,7 +4315,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12624863915440686736
+          9983105971613979552
         ]
       ], 
       "reviewed-by-human": true
@@ -4324,7 +4324,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7558753041292568070
+          17270370206570728368
         ]
       ], 
       "reviewed-by-human": true
@@ -4333,7 +4333,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12624863915440686736
+          9983105971613979552
         ]
       ], 
       "reviewed-by-human": true
@@ -19479,7 +19479,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3196650548285977166
+          1096193628485565598
         ]
       ], 
       "reviewed-by-human": true
@@ -19488,7 +19488,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11504299822100144685
+          4175065946076041612
         ]
       ], 
       "reviewed-by-human": true
@@ -19497,7 +19497,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4323854140016112056
+          1096193628485565598
         ]
       ], 
       "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 68ecf8e24c..71ffd77fc8 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
@@ -4315,7 +4315,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12624863915440686736
+          9983105971613979552
         ]
       ], 
       "reviewed-by-human": true
@@ -4324,7 +4324,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7558753041292568070
+          17270370206570728368
         ]
       ], 
       "reviewed-by-human": true
@@ -4333,7 +4333,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12624863915440686736
+          9983105971613979552
         ]
       ], 
       "reviewed-by-human": true
@@ -19572,7 +19572,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3196650548285977166
+          1096193628485565598
         ]
       ], 
       "reviewed-by-human": true
@@ -19581,7 +19581,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11504299822100144685
+          4175065946076041612
         ]
       ], 
       "reviewed-by-human": true
@@ -19590,7 +19590,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4323854140016112056
+          1096193628485565598
         ]
       ], 
       "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 8623868eae..20b23bc9e2 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
@@ -2835,7 +2835,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7048546964514197209
+          6125999814927110010
         ]
       ], 
       "reviewed-by-human": true
@@ -12478,7 +12478,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7528118218484535186
+          16247834823762474386
         ]
       ], 
       "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 371d2d0dda..fbee5a3985 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
@@ -3529,7 +3529,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12469056507152539419
+          17046057478038953801
         ]
       ], 
       "reviewed-by-human": true
@@ -14028,7 +14028,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14259084747229232786
+          16247834823762474386
         ]
       ], 
       "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 d656ef8f89..7485c722a3 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
@@ -946,7 +946,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18100642558132966921
+          5237815601387355017
         ]
       ], 
       "reviewed-by-human": true
@@ -2857,13 +2857,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7136178481173034802
+          1110154143053014766
         ]
       ], 
-      "bugs": [
-        2146
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "blurrects_pdf-poppler.png": {
       "allowed-digests": [
@@ -12095,7 +12092,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3430943938532712806
+          2147637739356279616
         ]
       ], 
       "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 3e2bb771b7..6330276317 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
@@ -977,13 +977,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12195310936180436782
+          7116235367842840302
         ]
       ], 
-      "bugs": [
-        2762
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "bleed_pdf-poppler.png": {
       "allowed-digests": [
@@ -2848,7 +2845,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7048546964514197209
+          6125999814927110010
         ]
       ], 
       "reviewed-by-human": true
@@ -12524,7 +12521,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7528118218484535186
+          16247834823762474386
         ]
       ], 
       "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 6d017e469d..593cd97f7e 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
@@ -977,13 +977,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12195310936180436782
+          7116235367842840302
         ]
       ], 
-      "bugs": [
-        2762
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "bleed_pdf-poppler.png": {
       "allowed-digests": [
@@ -2848,7 +2845,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7048546964514197209
+          6125999814927110010
         ]
       ], 
       "reviewed-by-human": true
@@ -4122,7 +4119,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16528727324311848794
+          16744562755291238983
         ]
       ], 
       "reviewed-by-human": true
@@ -12524,7 +12521,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7528118218484535186
+          16247834823762474386
         ]
       ], 
       "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 c6210f860f..3d87832582 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
@@ -1480,19 +1480,16 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17870693939301194374
+          8139094894363515070
         ]
       ], 
-      "bugs": [
-        2762
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "bleed_msaa16.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13014075482864288220
+          8030168239881559492
         ]
       ], 
       "reviewed-by-human": true
@@ -1501,13 +1498,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17870693939301194374
+          8139094894363515070
         ]
       ], 
-      "bugs": [
-        2762
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "bleed_pdf-poppler.png": {
       "allowed-digests": [
@@ -4342,7 +4336,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12624863915440686736
+          9983105971613979552
         ]
       ], 
       "reviewed-by-human": true
@@ -4351,7 +4345,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3305918433026350742
+          17270370206570728368
         ]
       ], 
       "reviewed-by-human": true
@@ -4360,7 +4354,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12624863915440686736
+          9983105971613979552
         ]
       ], 
       "reviewed-by-human": true
@@ -18948,7 +18942,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11427030262920236288
+          17763788251281759441
         ]
       ], 
       "reviewed-by-human": true
@@ -18957,7 +18951,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          262766361653694190
+          1661193991757691933
         ]
       ], 
       "reviewed-by-human": true
@@ -18966,7 +18960,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15915353739207416482
+          17763788251281759441
         ]
       ], 
       "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 3633e31738..9adec313d4 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
@@ -1480,19 +1480,16 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17870693939301194374
+          8139094894363515070
         ]
       ], 
-      "bugs": [
-        2762
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "bleed_msaa16.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13014075482864288220
+          8030168239881559492
         ]
       ], 
       "reviewed-by-human": true
@@ -1501,13 +1498,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17870693939301194374
+          8139094894363515070
         ]
       ], 
-      "bugs": [
-        2762
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "bleed_pdf-poppler.png": {
       "allowed-digests": [
@@ -4342,7 +4336,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12624863915440686736
+          9983105971613979552
         ]
       ], 
       "reviewed-by-human": true
@@ -4351,7 +4345,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3305918433026350742
+          17270370206570728368
         ]
       ], 
       "reviewed-by-human": true
@@ -4360,7 +4354,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12624863915440686736
+          9983105971613979552
         ]
       ], 
       "reviewed-by-human": true
@@ -18948,7 +18942,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11427030262920236288
+          17763788251281759441
         ]
       ], 
       "reviewed-by-human": true
@@ -18957,7 +18951,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          262766361653694190
+          1661193991757691933
         ]
       ], 
       "reviewed-by-human": true
@@ -18966,7 +18960,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15915353739207416482
+          17763788251281759441
         ]
       ], 
       "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 034ef62c8c..0344722aaa 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
@@ -1480,19 +1480,16 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17870693939301194374
+          8139094894363515070
         ]
       ], 
-      "bugs": [
-        2762
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "bleed_msaa16.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13014075482864288220
+          8030168239881559492
         ]
       ], 
       "reviewed-by-human": true
@@ -1501,13 +1498,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17870693939301194374
+          8139094894363515070
         ]
       ], 
-      "bugs": [
-        2762
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "bleed_pdf-poppler.png": {
       "allowed-digests": [
@@ -4342,7 +4336,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12624863915440686736
+          9983105971613979552
         ]
       ], 
       "reviewed-by-human": true
@@ -4351,7 +4345,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7558753041292568070
+          17270370206570728368
         ]
       ], 
       "reviewed-by-human": true
@@ -4360,7 +4354,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12624863915440686736
+          9983105971613979552
         ]
       ], 
       "reviewed-by-human": true
@@ -18950,7 +18944,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11427030262920236288
+          17763788251281759441
         ]
       ], 
       "reviewed-by-human": true
@@ -18959,7 +18953,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          262766361653694190
+          1661193991757691933
         ]
       ], 
       "reviewed-by-human": true
@@ -18968,7 +18962,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15915353739207416482
+          17763788251281759441
         ]
       ], 
       "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 3fd56500c6..6f7b35e203 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
@@ -1480,19 +1480,16 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17870693939301194374
+          8139094894363515070
         ]
       ], 
-      "bugs": [
-        2762
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "bleed_msaa16.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13014075482864288220
+          8030168239881559492
         ]
       ], 
       "reviewed-by-human": true
@@ -1501,13 +1498,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17870693939301194374
+          8139094894363515070
         ]
       ], 
-      "bugs": [
-        2762
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "bleed_pdf-poppler.png": {
       "allowed-digests": [
@@ -4342,7 +4336,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12624863915440686736
+          9983105971613979552
         ]
       ], 
       "reviewed-by-human": true
@@ -4351,7 +4345,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3305918433026350742
+          17270370206570728368
         ]
       ], 
       "reviewed-by-human": true
@@ -4360,7 +4354,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12624863915440686736
+          9983105971613979552
         ]
       ], 
       "reviewed-by-human": true
@@ -18949,7 +18943,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11427030262920236288
+          17763788251281759441
         ]
       ], 
       "reviewed-by-human": true
@@ -18958,7 +18952,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          262766361653694190
+          1661193991757691933
         ]
       ], 
       "reviewed-by-human": true
@@ -18967,7 +18961,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15915353739207416482
+          17763788251281759441
         ]
       ], 
       "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 1f2192e22c..f248904998 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
@@ -2968,7 +2968,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12471200664293097992
+          15207785042069048142
         ]
       ], 
       "reviewed-by-human": true
@@ -12703,7 +12703,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11082884731011323378
+          12297297836229314187
         ]
       ], 
       "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 1f2192e22c..f248904998 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
@@ -2968,7 +2968,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12471200664293097992
+          15207785042069048142
         ]
       ], 
       "reviewed-by-human": true
@@ -12703,7 +12703,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11082884731011323378
+          12297297836229314187
         ]
       ], 
       "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 7f6d446c2c..94533e88f2 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
@@ -2968,7 +2968,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12471200664293097992
+          15207785042069048142
         ]
       ], 
       "reviewed-by-human": true
@@ -12703,7 +12703,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11082884731011323378
+          12297297836229314187
         ]
       ], 
       "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 7f6d446c2c..94533e88f2 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
@@ -2968,7 +2968,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12471200664293097992
+          15207785042069048142
         ]
       ], 
       "reviewed-by-human": true
@@ -12703,7 +12703,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11082884731011323378
+          12297297836229314187
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt
index 5ee655fcb7..44577413b8 100644
--- a/expectations/gm/ignored-tests.txt
+++ b/expectations/gm/ignored-tests.txt
@@ -51,11 +51,6 @@ imagemagnifier
 #reed
 modecolorfilters
 
-#joshualitt
-bleed
-blurrects
-simpleblurroundrect
-
 #humper skia:2049
 dashcubics