New GPU baselines for colormatrix GM.

TBR=halcanary@google.com
BUG=skia:

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13784 2bbb7eff-a529-9590-31e7-b0007b416f81

43 files changed, 52 insertions, 57 deletions

diff --git a/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Debug/expected-results.json b/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Debug/expected-results.json
index 7eaac14587..7d6dd51d7f 100644
--- a/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Debug/expected-results.json
@@ -2565,7 +2565,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9179896739428124194
+          1575688773869978322
         ]
       ], 
       "bugs": [
diff --git a/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Release/expected-results.json b/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Release/expected-results.json
index be36fa2af1..65cbd71828 100644
--- a/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Release/expected-results.json
@@ -2565,7 +2565,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9179896739428124194
+          1575688773869978322
         ]
       ], 
       "bugs": [
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 182eb4eaaa..84e4332c0c 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
@@ -3202,7 +3202,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4759372320295262873
+          632768445634214292
         ]
       ], 
       "ignore-failure": false
@@ -3211,7 +3211,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4759372320295262873
+          632768445634214292
         ]
       ], 
       "ignore-failure": false
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 00e65e4a9c..50ccbcda61 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
@@ -3202,7 +3202,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4759372320295262873
+          632768445634214292
         ]
       ], 
       "ignore-failure": false
@@ -3211,7 +3211,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4759372320295262873
+          632768445634214292
         ]
       ], 
       "ignore-failure": false
diff --git a/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json
index 2da59de582..9f56d112c9 100644
--- a/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json
@@ -2779,7 +2779,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          637895803554466821
+          7201496349565256049
         ]
       ], 
       "bugs": [
diff --git a/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
index d88c0ca5ac..e6b9c260a4 100644
--- a/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
@@ -2779,7 +2779,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          637895803554466821
+          7201496349565256049
         ]
       ], 
       "bugs": [
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 e31c6512c9..8735917842 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
@@ -2453,7 +2453,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8369570073044939476
+          16420645228910782051
         ]
       ], 
       "bugs": [
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 e31c6512c9..8735917842 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
@@ -2453,7 +2453,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8369570073044939476
+          16420645228910782051
         ]
       ], 
       "bugs": [
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 ce12fcdf82..2ec1c02719 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
@@ -2491,7 +2491,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8369570073044939476
+          16420645228910782051
         ]
       ], 
       "bugs": [
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 392a0936d9..a7ee25b634 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
@@ -2491,7 +2491,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8369570073044939476
+          16420645228910782051
         ]
       ], 
       "bugs": [
diff --git a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/expected-results.json b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
index a57141534e..e12bb2c57e 100644
--- a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
@@ -4577,7 +4577,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
         ]
       ], 
       "bugs": [
diff --git a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/expected-results.json b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/expected-results.json
index 9b9e585c70..80d8150114 100644
--- a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/expected-results.json
@@ -4049,7 +4049,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
         ]
       ], 
       "bugs": [
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 1a9f8d7984..c0f342e5ef 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
@@ -4577,7 +4577,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
         ]
       ], 
       "bugs": [
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 31f4595018..e482715209 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
@@ -3725,7 +3725,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
         ]
       ], 
       "bugs": [
diff --git a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug/expected-results.json b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
index e3ec9a3ca0..8dde849e76 100644
--- a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
@@ -4916,7 +4916,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
         ]
       ], 
       "bugs": [
diff --git a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/expected-results.json b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/expected-results.json
index e71819addc..da44cdc880 100644
--- a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/expected-results.json
@@ -4472,7 +4472,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
         ]
       ], 
       "bugs": [
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 54f1ddfa0e..93e434f0ba 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
@@ -4916,7 +4916,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
         ]
       ], 
       "bugs": [
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 6d9de6ea5b..8d09670a93 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
@@ -4076,7 +4076,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
         ]
       ], 
       "bugs": [
diff --git a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/expected-results.json b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
index 3a0ab71069..e923c3f664 100644
--- a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
@@ -4642,7 +4642,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
         ]
       ], 
       "bugs": [
diff --git a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release/expected-results.json b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release/expected-results.json
index ed842756ab..06abb9d2b1 100644
--- a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release/expected-results.json
@@ -4366,7 +4366,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
         ]
       ], 
       "bugs": [
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 63beb599eb..1e2372fe9e 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
@@ -4642,7 +4642,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
         ]
       ], 
       "bugs": [
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 458574cd72..72cdb619dc 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
@@ -4234,7 +4234,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
         ]
       ], 
       "bugs": [
diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug/expected-results.json
index 5e636bd2ae..1e4d970520 100644
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug/expected-results.json
@@ -3500,7 +3500,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12021799543936122703
+          13708022221708423298
         ]
       ], 
       "bugs": [
diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Release/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Release/expected-results.json
index 6e0e290e8a..bf6cacd6c2 100644
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Release/expected-results.json
@@ -3500,7 +3500,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12021799543936122703
+          13708022221708423298
         ]
       ], 
       "bugs": [
diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Debug/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Debug/expected-results.json
index 4ea8b90d67..a78cdf37b8 100644
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Debug/expected-results.json
@@ -3500,7 +3500,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12021799543936122703
+          13708022221708423298
         ]
       ], 
       "bugs": [
diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/expected-results.json
index 107f57a1a6..3578ec22f6 100644
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/expected-results.json
@@ -3500,7 +3500,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12021799543936122703
+          13708022221708423298
         ]
       ], 
       "bugs": [
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 ea89afe32a..407d05c8bc 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
@@ -4577,7 +4577,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1539225048519213519
+          3292253571851442107
         ]
       ], 
       "bugs": [
diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite/expected-results.json
index b7a34cca21..9516d19268 100644
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite/expected-results.json
@@ -3515,7 +3515,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1539225048519213519
+          3292253571851442107
         ]
       ], 
       "bugs": [
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 cf6cdde023..4d8927e58f 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
@@ -3497,7 +3497,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1539225048519213519
+          3292253571851442107
         ]
       ], 
       "bugs": [
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 637e371fd2..5524239e4a 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
@@ -4577,7 +4577,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1539225048519213519
+          3292253571851442107
         ]
       ], 
       "bugs": [
diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/expected-results.json
index 4570d0b3ea..ea743d2bef 100644
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/expected-results.json
@@ -3515,7 +3515,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1539225048519213519
+          3292253571851442107
         ]
       ], 
       "bugs": [
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 e01ba35c9a..2aa04122ef 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
@@ -3547,7 +3547,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3803776117583071141
+          1290342250623999108
         ]
       ], 
       "bugs": [
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 286876d2e6..e6283b4b59 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
@@ -3497,7 +3497,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1539225048519213519
+          3292253571851442107
         ]
       ], 
       "bugs": [
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 286876d2e6..e6283b4b59 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
@@ -3497,7 +3497,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1539225048519213519
+          3292253571851442107
         ]
       ], 
       "bugs": [
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 8096e6232b..29124edcc3 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
@@ -5578,7 +5578,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
         ]
       ], 
       "bugs": [
@@ -5590,7 +5590,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
         ]
       ], 
       "bugs": [
@@ -5602,7 +5602,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
         ]
       ], 
       "reviewed-by-human": false
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 b0568b7b73..cab95840cd 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
@@ -5578,7 +5578,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
         ]
       ], 
       "bugs": [
@@ -5590,7 +5590,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
         ]
       ], 
       "bugs": [
@@ -5602,7 +5602,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
         ]
       ], 
       "reviewed-by-human": false
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 8c8b6b9223..e900f14582 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
@@ -5578,7 +5578,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
         ]
       ], 
       "bugs": [
@@ -5590,7 +5590,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
         ]
       ], 
       "bugs": [
@@ -5602,7 +5602,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
         ]
       ], 
       "reviewed-by-human": false
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 94d0583761..2b11d38d17 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
@@ -5578,7 +5578,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
         ]
       ], 
       "bugs": [
@@ -5590,7 +5590,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
         ]
       ], 
       "bugs": [
@@ -5602,7 +5602,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16570402526967350290
+          10772261323503226822
         ]
       ], 
       "reviewed-by-human": false
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 329c5f50ad..8a5cfa1e8b 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
@@ -3871,7 +3871,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12021799543936122703
+          13708022221708423298
         ]
       ], 
       "bugs": [
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 c6809d94fa..9521074fb9 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
@@ -3871,7 +3871,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12021799543936122703
+          13708022221708423298
         ]
       ], 
       "bugs": [
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 30bbee0409..a1f256f3b6 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
@@ -3871,7 +3871,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12021799543936122703
+          13708022221708423298
         ]
       ], 
       "bugs": [
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 30bbee0409..a1f256f3b6 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
@@ -3871,7 +3871,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12021799543936122703
+          13708022221708423298
         ]
       ], 
       "bugs": [
diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt
index 9baba7eee0..d9db6bce52 100644
--- a/expectations/gm/ignored-tests.txt
+++ b/expectations/gm/ignored-tests.txt
@@ -51,8 +51,3 @@ rrect_clip_aa
 # This change removes an API that this GM was testing. If/when it lands and sticks,
 # I will likely just delete the GM.
 canvas-layer-state
-
-# senorblanco: https://codereview.chromium.org/196133006/
-# The setYUV2RGB sample in transparent mode in this GM this test has always
-# drawn incorrectly on the GPU.  The change above fixes it.
-colormatrix