Rebaseline imagefiltersscaled GM.

Rebaseline imagefiltersscaled GM for new test cases added in
https://code.google.com/p/skia/source/detail?r=13798.

TBR=jcgregorio@google.com
BUG=skia:

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

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

55 files changed, 190 insertions, 194 deletions

diff --git a/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json
index 619409fda3..d5e4cfc077 100644
--- a/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json
@@ -4335,7 +4335,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          873090063366456848
+          4979386034764191046
         ]
       ]
     }, 
@@ -4343,7 +4343,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2117919755538087269
+          3471594746149407768
         ]
       ]
     }, 
diff --git a/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json
index d766c3ff62..5d3b5d9ee5 100644
--- a/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json
@@ -4327,7 +4327,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          873090063366456848
+          4979386034764191046
         ]
       ]
     }, 
@@ -4335,7 +4335,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2117919755538087269
+          3471594746149407768
         ]
       ]
     }, 
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 5a01b741f0..84b89a3f08 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
@@ -5611,7 +5611,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16418749844590680130
+          11142198352768648179
         ]
       ]
     }, 
@@ -5619,7 +5619,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18240477891716779272
+          17216468313331570781
         ]
       ]
     }, 
@@ -5627,7 +5627,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4607504387635238441
+          17667280750482645242
         ]
       ]
     }, 
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 1d2bd9a879..e0fb75562f 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
@@ -5612,7 +5612,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16418749844590680130
+          11142198352768648179
         ]
       ]
     }, 
@@ -5620,7 +5620,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18240477891716779272
+          17216468313331570781
         ]
       ]
     }, 
@@ -5628,7 +5628,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4607504387635238441
+          17667280750482645242
         ]
       ]
     }, 
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 e8fb865791..e2399a07a0 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
@@ -6959,7 +6959,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          873090063366456848
+          4979386034764191046
         ]
       ]
     }, 
@@ -6967,7 +6967,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2117919755538087269
+          3471594746149407768
         ]
       ]
     }, 
@@ -6975,7 +6975,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17848919390719336254
+          7984057522805858516
         ]
       ]
     }, 
@@ -6983,7 +6983,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16891313336151748372
+          28560584844019362
         ]
       ]
     }, 
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 2fccd8ff88..86505fb4ea 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
@@ -6959,7 +6959,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          873090063366456848
+          4979386034764191046
         ]
       ]
     }, 
@@ -6967,7 +6967,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2117919755538087269
+          3471594746149407768
         ]
       ]
     }, 
@@ -6975,7 +6975,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17848919390719336254
+          7984057522805858516
         ]
       ]
     }, 
@@ -6983,7 +6983,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16891313336151748372
+          28560584844019362
         ]
       ]
     }, 
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 a20b90d56c..aa048fe0dd 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
@@ -6313,7 +6313,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          873090063366456848
+          4979386034764191046
         ]
       ]
     }, 
@@ -6321,7 +6321,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2117919755538087269
+          3471594746149407768
         ]
       ]
     }, 
@@ -6329,7 +6329,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10138490410524073417
+          9835891982322100218
         ]
       ]
     }, 
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 dbd3d64f52..812b9d24df 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
@@ -6313,7 +6313,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          873090063366456848
+          4979386034764191046
         ]
       ]
     }, 
@@ -6321,7 +6321,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2117919755538087269
+          3471594746149407768
         ]
       ]
     }, 
@@ -6329,7 +6329,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10138490410524073417
+          9835891982322100218
         ]
       ]
     }, 
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 a25e5f3dd2..7a6114fcc9 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
@@ -5144,7 +5144,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          873090063366456848
+          4979386034764191046
         ]
       ]
     }, 
@@ -5152,7 +5152,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2117919755538087269
+          3471594746149407768
         ]
       ]
     }, 
@@ -5160,7 +5160,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7820548748392128352
+          5058159534642161395
         ]
       ]
     }, 
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 a25e5f3dd2..7a6114fcc9 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
@@ -5144,7 +5144,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          873090063366456848
+          4979386034764191046
         ]
       ]
     }, 
@@ -5152,7 +5152,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2117919755538087269
+          3471594746149407768
         ]
       ]
     }, 
@@ -5160,7 +5160,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7820548748392128352
+          5058159534642161395
         ]
       ]
     }, 
diff --git a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json
index 628b3933be..af35e80a96 100644
--- a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json
@@ -4360,7 +4360,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          873090063366456848
+          4979386034764191046
         ]
       ]
     }, 
@@ -4368,7 +4368,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2117919755538087269
+          3471594746149407768
         ]
       ]
     }, 
diff --git a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json
index 628b3933be..af35e80a96 100644
--- a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json
@@ -4360,7 +4360,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          873090063366456848
+          4979386034764191046
         ]
       ]
     }, 
@@ -4368,7 +4368,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2117919755538087269
+          3471594746149407768
         ]
       ]
     }, 
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 42a7ccf1d2..15c8ebc7c9 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
@@ -5235,7 +5235,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -5243,7 +5243,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
@@ -5251,7 +5251,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14182213978254379308
+          18167360877300238860
         ]
       ]
     }, 
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 b69e217e0f..f93386fa42 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
@@ -5235,7 +5235,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -5243,7 +5243,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
@@ -5251,7 +5251,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14182213978254379308
+          18167360877300238860
         ]
       ]
     }, 
diff --git a/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json b/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json
index cf6e5aa891..d97089ff5b 100644
--- a/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json
@@ -4016,7 +4016,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16285715882035285461
+          18129600525400419152
         ]
       ]
     }, 
@@ -4024,7 +4024,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4789596027450618976
+          12368699066850634787
         ]
       ]
     }, 
diff --git a/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json b/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json
index 3e1919ae84..14ada7a63d 100644
--- a/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json
@@ -4013,7 +4013,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4146202881542350068
+          15264910862290636420
         ]
       ]
     }, 
@@ -4021,7 +4021,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14086914742893417229
+          6809413310483973461
         ]
       ]
     }, 
diff --git a/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json b/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json
index 29fb30c74b..b1dcc8cf81 100644
--- a/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json
@@ -4025,7 +4025,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -4033,7 +4033,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
diff --git a/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json b/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json
index a91adcda5f..eda12ea84f 100644
--- a/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json
@@ -4025,7 +4025,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -4033,7 +4033,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
diff --git a/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json b/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json
index 2e6f726e7c..80f33d6389 100644
--- a/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json
@@ -4025,7 +4025,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16418749844590680130
+          11142198352768648179
         ]
       ]
     }, 
@@ -4033,7 +4033,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18240477891716779272
+          17216468313331570781
         ]
       ]
     }, 
diff --git a/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Release/expected-results.json b/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Release/expected-results.json
index 2e6f726e7c..80f33d6389 100644
--- a/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Release/expected-results.json
@@ -4025,7 +4025,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16418749844590680130
+          11142198352768648179
         ]
       ]
     }, 
@@ -4033,7 +4033,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18240477891716779272
+          17216468313331570781
         ]
       ]
     }, 
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 e12bb2c57e..1141a8d938 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
@@ -9998,7 +9998,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -10006,7 +10006,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
@@ -10014,7 +10014,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15276328572180701158
+          8126282611016392185
         ]
       ]
     }, 
@@ -10022,7 +10022,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8149041933439041877
+          4768898103244283309
         ]
       ]
     }, 
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 80d8150114..4d3405a49c 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
@@ -8991,7 +8991,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -8999,7 +8999,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
@@ -9007,7 +9007,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15276328572180701158
+          8126282611016392185
         ]
       ]
     }, 
@@ -9015,7 +9015,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8149041933439041877
+          4768898103244283309
         ]
       ]
     }, 
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 c0f342e5ef..7f857288b3 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
@@ -9990,7 +9990,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -9998,7 +9998,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
@@ -10006,7 +10006,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15276328572180701158
+          8126282611016392185
         ]
       ]
     }, 
@@ -10014,7 +10014,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8149041933439041877
+          4768898103244283309
         ]
       ]
     }, 
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 e482715209..6f97ba6dd6 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
@@ -8472,7 +8472,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -8480,7 +8480,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
@@ -8488,7 +8488,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15276328572180701158
+          8126282611016392185
         ]
       ]
     }, 
@@ -8496,7 +8496,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8149041933439041877
+          4768898103244283309
         ]
       ]
     }, 
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 8dde849e76..36e96dbb47 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
@@ -10381,7 +10381,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -10389,7 +10389,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
@@ -10397,7 +10397,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15276328572180701158
+          8126282611016392185
         ]
       ]
     }, 
@@ -10405,7 +10405,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8149041933439041877
+          4768898103244283309
         ]
       ]
     }, 
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 da44cdc880..f395f4eebb 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
@@ -9462,7 +9462,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -9470,7 +9470,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
@@ -9478,7 +9478,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15276328572180701158
+          8126282611016392185
         ]
       ]
     }, 
@@ -9486,7 +9486,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8149041933439041877
+          4768898103244283309
         ]
       ]
     }, 
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 93e434f0ba..4196c942aa 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
@@ -10389,7 +10389,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -10397,7 +10397,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
@@ -10405,7 +10405,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15276328572180701158
+          8126282611016392185
         ]
       ]
     }, 
@@ -10413,7 +10413,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8149041933439041877
+          4768898103244283309
         ]
       ]
     }, 
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 8d09670a93..7edca50bf9 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
@@ -8890,7 +8890,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -8898,7 +8898,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
@@ -8906,7 +8906,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15276328572180701158
+          8126282611016392185
         ]
       ]
     }, 
@@ -8914,7 +8914,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8149041933439041877
+          4768898103244283309
         ]
       ]
     }, 
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 e923c3f664..c64522336a 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
@@ -9935,7 +9935,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -9943,7 +9943,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
@@ -9951,7 +9951,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15276328572180701158
+          8126282611016392185
         ]
       ]
     }, 
@@ -9959,7 +9959,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8149041933439041877
+          4768898103244283309
         ]
       ]
     }, 
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 06abb9d2b1..1f6ad54fc8 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
@@ -9246,7 +9246,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -9254,7 +9254,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
@@ -9262,7 +9262,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15276328572180701158
+          8126282611016392185
         ]
       ]
     }, 
@@ -9270,7 +9270,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8149041933439041877
+          4768898103244283309
         ]
       ]
     }, 
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 1e2372fe9e..9f500e1930 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
@@ -9935,7 +9935,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -9943,7 +9943,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
@@ -9951,7 +9951,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15276328572180701158
+          8126282611016392185
         ]
       ]
     }, 
@@ -9959,7 +9959,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8149041933439041877
+          4768898103244283309
         ]
       ]
     }, 
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 df1b31700e..b85ca67802 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
@@ -9514,7 +9514,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -9522,7 +9522,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
@@ -9530,7 +9530,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15276328572180701158
+          8126282611016392185
         ]
       ]
     }, 
@@ -9538,7 +9538,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8149041933439041877
+          4768898103244283309
         ]
       ]
     }, 
@@ -9546,7 +9546,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          179738712216389099
+          9096966217280988319
         ]
       ], 
       "reviewed-by-human": true
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 1e4d970520..36b55655fb 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
@@ -7423,7 +7423,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16285715882035285461
+          18129600525400419152
         ]
       ]
     }, 
@@ -7431,7 +7431,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4789596027450618976
+          12368699066850634787
         ]
       ]
     }, 
@@ -7439,7 +7439,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13525790441862922649
+          11778882405248769421
         ]
       ]
     }, 
@@ -7447,7 +7447,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2378924486338532427
+          7403124810876127284
         ]
       ]
     }, 
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 bf6cacd6c2..1261207bfe 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
@@ -7423,7 +7423,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16418749844590680130
+          11142198352768648179
         ]
       ]
     }, 
@@ -7431,7 +7431,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10168518718746232247
+          12121225305379378712
         ]
       ]
     }, 
@@ -7439,7 +7439,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13525790441862922649
+          11778882405248769421
         ]
       ]
     }, 
@@ -7447,7 +7447,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2378924486338532427
+          7403124810876127284
         ]
       ]
     }, 
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 a78cdf37b8..e82e46849b 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
@@ -7423,7 +7423,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16418749844590680130
+          11142198352768648179
         ]
       ]
     }, 
@@ -7431,7 +7431,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18240477891716779272
+          17216468313331570781
         ]
       ]
     }, 
@@ -7439,7 +7439,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13525790441862922649
+          3458726169910342395
         ]
       ]
     }, 
@@ -7447,7 +7447,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2378924486338532427
+          7403124810876127284
         ]
       ]
     }, 
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 3578ec22f6..efc73001ab 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
@@ -7423,7 +7423,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16418749844590680130
+          11142198352768648179
         ]
       ]
     }, 
@@ -7431,7 +7431,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18240477891716779272
+          17216468313331570781
         ]
       ]
     }, 
@@ -7439,7 +7439,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13525790441862922649
+          3458726169910342395
         ]
       ]
     }, 
@@ -7447,7 +7447,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2378924486338532427
+          7403124810876127284
         ]
       ]
     }, 
diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-NoGPU-x86_64-Debug/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-NoGPU-x86_64-Debug/expected-results.json
index ccb4d58f66..4c9b7b6c97 100644
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-NoGPU-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-NoGPU-x86_64-Debug/expected-results.json
@@ -6562,7 +6562,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16418749844590680130
+          11142198352768648179
         ]
       ]
     }, 
@@ -6570,7 +6570,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18240477891716779272
+          17216468313331570781
         ]
       ]
     }, 
@@ -6578,7 +6578,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2378924486338532427
+          7403124810876127284
         ]
       ]
     }, 
diff --git a/expectations/gm/Test-Ubuntu13-ShuttleA-HD2000-x86_64-Debug-ASAN/expected-results.json b/expectations/gm/Test-Ubuntu13-ShuttleA-HD2000-x86_64-Debug-ASAN/expected-results.json
index 719480ea6d..af62cc7bec 100644
--- a/expectations/gm/Test-Ubuntu13-ShuttleA-HD2000-x86_64-Debug-ASAN/expected-results.json
+++ b/expectations/gm/Test-Ubuntu13-ShuttleA-HD2000-x86_64-Debug-ASAN/expected-results.json
@@ -68,7 +68,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16418749844590680130
+          11142198352768648179
         ]
       ]
     }, 
@@ -76,7 +76,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18240477891716779272
+          17216468313331570781
         ]
       ]
     }, 
@@ -84,7 +84,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6801935591469149689
+          8877499313441323086
         ]
       ]
     }, 
@@ -92,7 +92,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2378924486338532427
+          7403124810876127284
         ]
       ]
     }
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 407d05c8bc..27ab1477d8 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
@@ -9800,7 +9800,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13672536708958250553
+          8048174065831948696
         ]
       ]
     }, 
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 9516d19268..5460b49721 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
@@ -7484,7 +7484,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14204203107818031947
+          6906844907221404560
         ]
       ]
     }, 
@@ -7492,7 +7492,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10603814619237197247
+          8392278230396750338
         ]
       ]
     }, 
@@ -7500,7 +7500,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10220015991633953250
+          16236721268324357263
         ]
       ]
     }, 
@@ -7508,7 +7508,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2378924486338532427
+          7403124810876127284
         ]
       ]
     }, 
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 4d8927e58f..adbba21a38 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
@@ -7472,7 +7472,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14204203107818031947
+          6906844907221404560
         ]
       ]
     }, 
@@ -7480,7 +7480,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10603814619237197247
+          8392278230396750338
         ]
       ]
     }, 
@@ -7488,7 +7488,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10220015991633953250
+          16236721268324357263
         ]
       ]
     }, 
@@ -7496,7 +7496,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2378924486338532427
+          7403124810876127284
         ]
       ]
     }, 
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 5524239e4a..ee89daa430 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
@@ -9800,7 +9800,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13672536708958250553
+          8048174065831948696
         ]
       ]
     }, 
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 ea743d2bef..48b6282877 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
@@ -7484,7 +7484,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14204203107818031947
+          6906844907221404560
         ]
       ]
     }, 
@@ -7492,7 +7492,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10603814619237197247
+          8392278230396750338
         ]
       ]
     }, 
@@ -7500,7 +7500,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10220015991633953250
+          16236721268324357263
         ]
       ]
     }, 
@@ -7508,7 +7508,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2378924486338532427
+          7403124810876127284
         ]
       ]
     }, 
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 70d22a1c93..501906a7f6 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
@@ -8293,7 +8293,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15902574037875604957
+          4883484985852481372
         ]
       ]
     }, 
@@ -8301,7 +8301,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17703105217437266490
+          5119548928893938524
         ]
       ]
     }, 
@@ -8309,7 +8309,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17916944577514867175
+          4116288366135835232
         ]
       ]
     }, 
@@ -8317,7 +8317,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15651833297939472607
+          3705758857776045239
         ]
       ]
     }, 
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 e6283b4b59..70a06b7a9a 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
@@ -7472,7 +7472,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -7480,7 +7480,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
@@ -7488,7 +7488,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10220015991633953250
+          16236721268324357263
         ]
       ]
     }, 
@@ -7496,7 +7496,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2378924486338532427
+          7403124810876127284
         ]
       ]
     }, 
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 e6283b4b59..70a06b7a9a 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
@@ -7472,7 +7472,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -7480,7 +7480,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
@@ -7488,7 +7488,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10220015991633953250
+          16236721268324357263
         ]
       ]
     }, 
@@ -7496,7 +7496,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2378924486338532427
+          7403124810876127284
         ]
       ]
     }, 
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 29124edcc3..eb24f24726 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
@@ -12100,7 +12100,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -12108,7 +12108,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
@@ -12116,7 +12116,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8892541808195811739
+          3262803126131585722
         ]
       ]
     }, 
@@ -12124,7 +12124,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10364626656872700368
+          11426838740980958872
         ]
       ]
     }, 
@@ -12132,7 +12132,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17548646937997249694
+          9659350677391822056
         ]
       ], 
       "reviewed-by-human": false
@@ -12141,7 +12141,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2378924486338532427
+          7403124810876127284
         ]
       ]
     }, 
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 cab95840cd..3fc019de94 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
@@ -12100,7 +12100,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -12108,7 +12108,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
@@ -12116,7 +12116,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8892541808195811739
+          3262803126131585722
         ]
       ]
     }, 
@@ -12124,7 +12124,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10364626656872700368
+          11426838740980958872
         ]
       ]
     }, 
@@ -12132,7 +12132,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17548646937997249694
+          9659350677391822056
         ]
       ], 
       "reviewed-by-human": false
@@ -12141,7 +12141,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2378924486338532427
+          7403124810876127284
         ]
       ]
     }, 
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 e900f14582..03dafc61c5 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
@@ -12100,7 +12100,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -12108,7 +12108,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
@@ -12116,7 +12116,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8892541808195811739
+          3262803126131585722
         ]
       ]
     }, 
@@ -12124,7 +12124,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10364626656872700368
+          11426838740980958872
         ]
       ]
     }, 
@@ -12132,7 +12132,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17548646937997249694
+          9659350677391822056
         ]
       ], 
       "reviewed-by-human": false
@@ -12141,7 +12141,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2378924486338532427
+          7403124810876127284
         ]
       ]
     }, 
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 2b11d38d17..a94ac76a34 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
@@ -12091,7 +12091,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -12099,7 +12099,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
@@ -12107,7 +12107,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8892541808195811739
+          3262803126131585722
         ]
       ]
     }, 
@@ -12115,7 +12115,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10364626656872700368
+          11426838740980958872
         ]
       ]
     }, 
@@ -12123,7 +12123,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17548646937997249694
+          9659350677391822056
         ]
       ], 
       "reviewed-by-human": false
@@ -12132,7 +12132,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2378924486338532427
+          7403124810876127284
         ]
       ]
     }, 
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 8a5cfa1e8b..02993ab1f9 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
@@ -8327,7 +8327,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -8335,7 +8335,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
@@ -8343,7 +8343,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13525790441862922649
+          1389498434675647804
         ]
       ]
     }, 
@@ -8351,7 +8351,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2378924486338532427
+          7403124810876127284
         ]
       ]
     }, 
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 9521074fb9..22c2e9416b 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
@@ -8327,7 +8327,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -8335,7 +8335,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
@@ -8343,7 +8343,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13525790441862922649
+          1389498434675647804
         ]
       ]
     }, 
@@ -8351,7 +8351,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2378924486338532427
+          7403124810876127284
         ]
       ]
     }, 
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 a1f256f3b6..80ffbb9db2 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
@@ -8327,7 +8327,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -8335,7 +8335,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
@@ -8343,7 +8343,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13525790441862922649
+          1389498434675647804
         ]
       ]
     }, 
@@ -8351,7 +8351,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2378924486338532427
+          7403124810876127284
         ]
       ]
     }, 
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 a1f256f3b6..80ffbb9db2 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
@@ -8327,7 +8327,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2172843238646496675
+          11946238769617607854
         ]
       ]
     }, 
@@ -8335,7 +8335,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8893133107973931063
+          2721829120942518508
         ]
       ]
     }, 
@@ -8343,7 +8343,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13525790441862922649
+          1389498434675647804
         ]
       ]
     }, 
@@ -8351,7 +8351,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2378924486338532427
+          7403124810876127284
         ]
       ]
     }, 
diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt
index f087824ff4..d9db6bce52 100644
--- a/expectations/gm/ignored-tests.txt
+++ b/expectations/gm/ignored-tests.txt
@@ -51,7 +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
-
-# sugoi: https://codereview.chromium.org/198013002/
-# This adds proper Z scaling (with tests) for point lights and spot lights
-imagefiltersscaled