Rebaseline 6 GMs after crrev.com/841763005

BUG=skia:3299
TBR=djsollen@google.com

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

21 files changed, 132 insertions, 139 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 44b585098c..fd2332f600 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
@@ -7828,7 +7828,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3226696915312585268
+          14299801271700998828
         ]
       ], 
       "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 c4aa38ddb6..3c03e061cb 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
@@ -7823,7 +7823,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3226696915312585268
+          14299801271700998828
         ]
       ], 
       "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 ea14473711..e42fd573aa 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
@@ -13293,7 +13293,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3375589652752093711
+          14734068264942063335
         ]
       ], 
       "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 192f75af06..042687657d 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
@@ -11196,7 +11196,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3375589652752093711
+          14734068264942063335
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-NexusPlayer-PowerVR-x86-Debug/expected-results.json b/expectations/gm/Test-Android-NexusPlayer-PowerVR-x86-Debug/expected-results.json
index a06eb9a942..4b7f24facb 100644
--- a/expectations/gm/Test-Android-NexusPlayer-PowerVR-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-NexusPlayer-PowerVR-x86-Debug/expected-results.json
@@ -10274,7 +10274,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7665020567837097296
+          12654350900280824093
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-NexusPlayer-PowerVR-x86-Release/expected-results.json b/expectations/gm/Test-Android-NexusPlayer-PowerVR-x86-Release/expected-results.json
index 10328a5013..f452f76944 100644
--- a/expectations/gm/Test-Android-NexusPlayer-PowerVR-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Android-NexusPlayer-PowerVR-x86-Release/expected-results.json
@@ -10298,7 +10298,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7665020567837097296
+          12654350900280824093
         ]
       ], 
       "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 b4ea69c1a4..9aaa2a20c1 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
@@ -6017,10 +6017,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13415066704472475041
+          18353522168743323242
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "composeshader_gpu.png": {
       "allowed-digests": [
@@ -6035,7 +6035,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13476719363156020502
+          16001672878877434014
         ]
       ], 
       "reviewed-by-human": true
@@ -14570,19 +14570,19 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13712645074845199757
+          4231602261205850596
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "perlinnoise_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17120868825023817733
+          16826985251058085196
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "perlinnoise_pdf-poppler.png": {
       "allowed-digests": [
@@ -14699,7 +14699,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14216303782656832603
+          15335798786120602536
         ]
       ], 
       "reviewed-by-human": true
@@ -14735,10 +14735,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11685055315519282691
+          887076917414636211
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "points_565.png": {
       "allowed-digests": [
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 94be36a1d4..782c4d90cb 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
@@ -5105,10 +5105,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13415066704472475041
+          18353522168743323242
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "composeshader_gpu.png": {
       "allowed-digests": [
@@ -5123,7 +5123,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13476719363156020502
+          16001672878877434014
         ]
       ], 
       "reviewed-by-human": true
@@ -12825,19 +12825,19 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13712645074845199757
+          4231602261205850596
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "perlinnoise_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17120868825023817733
+          16826985251058085196
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "pictureimagefilter_565.png": {
       "allowed-digests": [
@@ -12942,7 +12942,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14216303782656832603
+          15335798786120602536
         ]
       ], 
       "reviewed-by-human": true
@@ -12978,10 +12978,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11685055315519282691
+          887076917414636211
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "points_565.png": {
       "allowed-digests": [
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 815f488dcf..aa19ffcd5c 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
@@ -6365,10 +6365,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13415066704472475041
+          18353522168743323242
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "composeshader_gpu.png": {
       "allowed-digests": [
@@ -6383,7 +6383,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13476719363156020502
+          16001672878877434014
         ]
       ], 
       "reviewed-by-human": true
@@ -15005,19 +15005,19 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13712645074845199757
+          4231602261205850596
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "perlinnoise_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17120868825023817733
+          16826985251058085196
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "perlinnoise_pdf-poppler.png": {
       "allowed-digests": [
@@ -15134,7 +15134,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16651068500560152330
+          8564341010609691094
         ]
       ], 
       "reviewed-by-human": true
@@ -15170,10 +15170,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11685055315519282691
+          887076917414636211
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "points_565.png": {
       "allowed-digests": [
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 0831d3e037..766965da78 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
@@ -5477,10 +5477,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13415066704472475041
+          18353522168743323242
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "composeshader_gpu.png": {
       "allowed-digests": [
@@ -5495,7 +5495,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13476719363156020502
+          16001672878877434014
         ]
       ], 
       "reviewed-by-human": true
@@ -13266,19 +13266,19 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13712645074845199757
+          4231602261205850596
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "perlinnoise_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17120868825023817733
+          16826985251058085196
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "pictureimagefilter_565.png": {
       "allowed-digests": [
@@ -13383,7 +13383,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16651068500560152330
+          8564341010609691094
         ]
       ], 
       "reviewed-by-human": true
@@ -13419,10 +13419,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11685055315519282691
+          887076917414636211
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "points_565.png": {
       "allowed-digests": [
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 3ac4c48e1a..93d7a753db 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
@@ -5881,10 +5881,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13415066704472475041
+          18353522168743323242
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "composeshader_gpu.png": {
       "allowed-digests": [
@@ -5899,7 +5899,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13476719363156020502
+          16001672878877434014
         ]
       ], 
       "reviewed-by-human": true
@@ -13974,19 +13974,19 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13712645074845199757
+          4231602261205850596
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "perlinnoise_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17120868825023817733
+          16826985251058085196
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "perlinnoise_pdf-poppler.png": {
       "allowed-digests": [
@@ -14103,7 +14103,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16651068500560152330
+          8564341010609691094
         ]
       ], 
       "reviewed-by-human": true
@@ -14139,10 +14139,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11685055315519282691
+          887076917414636211
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "points_565.png": {
       "allowed-digests": [
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 fe7cb72554..52a3690090 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
@@ -6049,20 +6049,20 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13415066704472475041
+          18353522168743323242
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "composeshader_alpha_pdf-native.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13459164253609731355
+          12562082043642531623
         ]
       ], 
       "ignore-failure": true, 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "composeshader_gpu.png": {
       "allowed-digests": [
@@ -6077,7 +6077,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13476719363156020502
+          16001672878877434014
         ]
       ], 
       "reviewed-by-human": true
@@ -6086,11 +6086,11 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13476719363156020502
+          9162605157736634400
         ]
       ], 
       "ignore-failure": true, 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "convex_poly_clip_565.png": {
       "allowed-digests": [
@@ -15024,35 +15024,35 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13712645074845199757
+          4231602261205850596
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "perlinnoise_localmatrix_pdf-native.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13712645074845199757
+          5625251103933888993
         ]
       ], 
       "ignore-failure": true, 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "perlinnoise_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17120868825023817733
+          16826985251058085196
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "perlinnoise_pdf-native.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17120868825023817733
+          6895727502203616773
         ]
       ], 
       "ignore-failure": true, 
@@ -15181,7 +15181,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16651068500560152330
+          8564341010609691094
         ]
       ], 
       "reviewed-by-human": true
@@ -15190,7 +15190,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12230105748651579368
+          16142879191770628382
         ]
       ], 
       "ignore-failure": true, 
@@ -15227,20 +15227,20 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11685055315519282691
+          887076917414636211
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "pictureshadertile_pdf-native.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11685055315519282691
+          5385400901781403153
         ]
       ], 
       "ignore-failure": true, 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "points_565.png": {
       "allowed-digests": [
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 ecdbd09137..d3eaa280ca 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
@@ -5800,10 +5800,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13415066704472475041
+          18353522168743323242
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "composeshader_gpu.png": {
       "allowed-digests": [
@@ -5818,7 +5818,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13476719363156020502
+          16001672878877434014
         ]
       ], 
       "reviewed-by-human": true
@@ -13753,19 +13753,19 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13712645074845199757
+          4722949839094812847
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "perlinnoise_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17120868825023817733
+          16826985251058085196
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "perlinnoise_pdf-poppler.png": {
       "allowed-digests": [
@@ -13882,7 +13882,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16651068500560152330
+          8564341010609691094
         ]
       ], 
       "reviewed-by-human": true
@@ -13918,10 +13918,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11685055315519282691
+          887076917414636211
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "points_565.png": {
       "allowed-digests": [
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 ed2c77422d..6ab0755cd0 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
@@ -5922,10 +5922,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13415066704472475041
+          18353522168743323242
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "composeshader_alpha_pdf-native.png": {
       "allowed-digests": [
@@ -5950,7 +5950,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13476719363156020502
+          16001672878877434014
         ]
       ], 
       "reviewed-by-human": true
@@ -14757,10 +14757,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13712645074845199757
+          4722949839094812847
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "perlinnoise_localmatrix_pdf-native.png": {
       "allowed-digests": [
@@ -14776,10 +14776,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17120868825023817733
+          16826985251058085196
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "perlinnoise_pdf-native.png": {
       "allowed-digests": [
@@ -14914,7 +14914,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16651068500560152330
+          8564341010609691094
         ]
       ], 
       "reviewed-by-human": true
@@ -14960,10 +14960,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11685055315519282691
+          887076917414636211
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "pictureshadertile_pdf-native.png": {
       "allowed-digests": [
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 400c987a76..15b2927988 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
@@ -6993,7 +6993,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7184155913134797738
+          626369516188339241
         ]
       ], 
       "reviewed-by-human": true
@@ -7029,7 +7029,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5326538105734651480
+          4250920314176115471
         ]
       ], 
       "reviewed-by-human": true
@@ -17312,10 +17312,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7769408336713819900
+          1784720912003573947
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "perlinnoise_msaa16.png": {
       "allowed-digests": [
@@ -17339,7 +17339,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8937529519831824191
+          341789680815947222
         ]
       ], 
       "reviewed-by-human": true
@@ -17501,7 +17501,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11025200251217190919
+          2724395556766072278
         ]
       ], 
       "reviewed-by-human": true
@@ -17555,10 +17555,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11685055315519282691
+          14175926004029954966
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "points_565.png": {
       "allowed-digests": [
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 05b68fa59e..462e3b2fb8 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
@@ -6992,7 +6992,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7184155913134797738
+          626369516188339241
         ]
       ], 
       "reviewed-by-human": true
@@ -7028,7 +7028,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5326538105734651480
+          4250920314176115471
         ]
       ], 
       "reviewed-by-human": true
@@ -17471,10 +17471,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7769408336713819900
+          1784720912003573947
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "perlinnoise_msaa16.png": {
       "allowed-digests": [
@@ -17498,7 +17498,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8937529519831824191
+          341789680815947222
         ]
       ], 
       "reviewed-by-human": true
@@ -17660,7 +17660,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11025200251217190919
+          2724395556766072278
         ]
       ], 
       "reviewed-by-human": true
@@ -17714,10 +17714,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11685055315519282691
+          14175926004029954966
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "points_565.png": {
       "allowed-digests": [
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 50f0923ed6..26160f73d2 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
@@ -7004,7 +7004,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7184155913134797738
+          626369516188339241
         ]
       ], 
       "reviewed-by-human": true
@@ -7040,7 +7040,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5326538105734651480
+          4250920314176115471
         ]
       ], 
       "reviewed-by-human": true
@@ -17360,10 +17360,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7769408336713819900
+          1784720912003573947
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "perlinnoise_msaa16.png": {
       "allowed-digests": [
@@ -17387,7 +17387,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8937529519831824191
+          334565601463257600
         ]
       ], 
       "reviewed-by-human": true
@@ -17549,7 +17549,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11025200251217190919
+          2724395556766072278
         ]
       ], 
       "reviewed-by-human": true
@@ -17603,10 +17603,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11685055315519282691
+          14175926004029954966
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "points_565.png": {
       "allowed-digests": [
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 ac7a627c1f..99647115e2 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
@@ -7004,7 +7004,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7184155913134797738
+          626369516188339241
         ]
       ], 
       "reviewed-by-human": true
@@ -7040,7 +7040,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5326538105734651480
+          4250920314176115471
         ]
       ], 
       "reviewed-by-human": true
@@ -17360,10 +17360,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7769408336713819900
+          1784720912003573947
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "perlinnoise_msaa16.png": {
       "allowed-digests": [
@@ -17387,7 +17387,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8937529519831824191
+          334565601463257600
         ]
       ], 
       "reviewed-by-human": true
@@ -17549,7 +17549,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11025200251217190919
+          2724395556766072278
         ]
       ], 
       "reviewed-by-human": true
@@ -17603,10 +17603,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11685055315519282691
+          14175926004029954966
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "points_565.png": {
       "allowed-digests": [
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 9b23d16d3a..89d822dabf 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
@@ -18682,7 +18682,7 @@
           16258109186950173986
         ]
       ], 
-      "ignore-failure": true,
+      "ignore-failure": true, 
       "reviewed-by-human": true
     }, 
     "shadertext_pdf-poppler.png": {
@@ -21925,4 +21925,4 @@
       "reviewed-by-human": true
     }
   }
-}
+}
\ No newline at end of file
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 533faa10cf..4d976aec9c 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
@@ -18684,7 +18684,7 @@
           16258109186950173986
         ]
       ], 
-      "ignore-failure": true,
+      "ignore-failure": true, 
       "reviewed-by-human": true
     }, 
     "shadertext_pdf-poppler.png": {
@@ -21925,4 +21925,4 @@
       "reviewed-by-human": true
     }
   }
-}
+}
\ No newline at end of file
diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt
index 54204b07cc..e692860c94 100644
--- a/expectations/gm/ignored-tests.txt
+++ b/expectations/gm/ignored-tests.txt
@@ -40,10 +40,3 @@ blurrects
 # New shadow only option in SkDropShadowImageFilter
 dropshadowimagefilter
 
-# fmalita http://crrev.com/841763005
-composeshader
-composeshader_alpha
-perlinnoise
-perlinnoise_localmatrix
-pictureshader
-pictureshadertile