New baselines for xfermodeimagefilter post-r12652.

TBR=reed@google.com BUG= Review URL: https://codereview.chromium.org/118803003 git-svn-id: http://skia.googlecode.com/svn/trunk@12769 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-19 15:41:12 +00:00 · 2013-12-19 15:41:12 +00:00 · 144cba079c
commit 144cba079c
parent 4ec5c95bc5
47 changed files with 135 additions and 138 deletions
--- a/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json
@ -6812,7 +6812,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2743499503521234071
+          1518829890315823560
        ]
      ], 
      "ignore-failure": false
@ -6821,7 +6821,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          9397902199232661802
+          8551804954298958567
        ]
      ], 
      "ignore-failure": false
@ -6830,7 +6830,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          15273534345116627355
+          16545395685382865175
        ]
      ], 
      "ignore-failure": false
--- a/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json
@ -6798,7 +6798,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2743499503521234071
+          1518829890315823560
        ]
      ], 
      "ignore-failure": false
@ -6807,7 +6807,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          9397902199232661802
+          8551804954298958567
        ]
      ], 
      "ignore-failure": false
@ -6816,7 +6816,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          15273534345116627355
+          16545395685382865175
        ]
      ], 
      "ignore-failure": false
--- a/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Debug/expected-results.json
@ -8698,7 +8698,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12363556987362898128
+          14905403940274501609
        ]
      ], 
      "bugs": [
@ -8710,7 +8710,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2884129524511338165
+          3297775470183074582
        ]
      ], 
      "bugs": [
@ -8722,7 +8722,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7195849753969942492
+          6501853508350703352
        ]
      ]
    }, 
--- a/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Release/expected-results.json
@ -8703,7 +8703,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12363556987362898128
+          14905403940274501609
        ]
      ], 
      "bugs": [
@ -8715,7 +8715,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2884129524511338165
+          3297775470183074582
        ]
      ], 
      "bugs": [
@ -8727,7 +8727,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7195849753969942492
+          6501853508350703352
        ]
      ]
    }, 
--- a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
@ -10637,7 +10637,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2743499503521234071
+          1518829890315823560
        ]
      ], 
      "ignore-failure": false
@ -10646,7 +10646,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          9397902199232661802
+          8551804954298958567
        ]
      ], 
      "ignore-failure": false
@ -10655,7 +10655,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1710350830640036204
+          9108928738134530051
        ]
      ], 
      "ignore-failure": false
@ -10664,7 +10664,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1710350830640036204
+          9108928738134530051
        ]
      ], 
      "ignore-failure": false
--- a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
@ -10637,7 +10637,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2743499503521234071
+          1518829890315823560
        ]
      ], 
      "ignore-failure": false
@ -10646,7 +10646,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          9397902199232661802
+          8551804954298958567
        ]
      ], 
      "ignore-failure": false
@ -10655,7 +10655,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1710350830640036204
+          9108928738134530051
        ]
      ], 
      "ignore-failure": false
@ -10664,7 +10664,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1710350830640036204
+          9108928738134530051
        ]
      ], 
      "ignore-failure": false
--- a/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json
@ -7231,7 +7231,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          816285493989701402
+          11108288624948601914
        ]
      ], 
      "bugs": [
@ -7243,7 +7243,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4741786511794689202
+          2619940543669562921
        ]
      ], 
      "bugs": [
@ -7255,7 +7255,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12491579724800443227
+          9851464383467381285
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
@ -7235,7 +7235,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          816285493989701402
+          11108288624948601914
        ]
      ], 
      "bugs": [
@ -7247,7 +7247,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4741786511794689202
+          2619940543669562921
        ]
      ], 
      "bugs": [
@ -7259,7 +7259,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12491579724800443227
+          9851464383467381285
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
@ -7834,7 +7834,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2743499503521234071
+          1518829890315823560
        ]
      ], 
      "ignore-failure": false
@ -7843,7 +7843,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          9397902199232661802
+          8551804954298958567
        ]
      ], 
      "ignore-failure": false
@ -7852,7 +7852,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4002624582522085585
+          5821682510624462811
        ]
      ], 
      "ignore-failure": false
--- a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
@ -7834,7 +7834,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2743499503521234071
+          1518829890315823560
        ]
      ], 
      "ignore-failure": false
@ -7843,7 +7843,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          9397902199232661802
+          8551804954298958567
        ]
      ], 
      "ignore-failure": false
@ -7852,7 +7852,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4002624582522085585
+          5821682510624462811
        ]
      ], 
      "ignore-failure": false
--- a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json
@ -6779,7 +6779,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12363556987362898128
+          14905403940274501609
        ]
      ], 
      "ignore-failure": false
@ -6788,7 +6788,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2884129524511338165
+          3297775470183074582
        ]
      ], 
      "ignore-failure": false
@ -6797,7 +6797,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7410231849714972527
+          9141960280774571418
        ]
      ], 
      "ignore-failure": false
--- a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json
@ -6779,7 +6779,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12363556987362898128
+          14905403940274501609
        ]
      ], 
      "ignore-failure": false
@ -6788,7 +6788,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2884129524511338165
+          3297775470183074582
        ]
      ], 
      "ignore-failure": false
@ -6797,7 +6797,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7410231849714972527
+          9141960280774571418
        ]
      ], 
      "ignore-failure": false
--- a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
@ -7943,7 +7943,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12363556987362898128
+          14905403940274501609
        ]
      ], 
      "bugs": [
@ -7955,7 +7955,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2884129524511338165
+          3297775470183074582
        ]
      ], 
      "bugs": [
@ -7967,7 +7967,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16522310053667368986
+          5751586818698243627
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
@ -7943,7 +7943,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12363556987362898128
+          14905403940274501609
        ]
      ], 
      "bugs": [
@ -7955,7 +7955,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2884129524511338165
+          3297775470183074582
        ]
      ], 
      "bugs": [
@ -7967,7 +7967,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16522310053667368986
+          5751586818698243627
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json
@ -6118,7 +6118,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6944540609614009533
+          3097518840997296951
        ]
      ], 
      "bugs": [
@ -6130,7 +6130,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3317112171584676149
+          7316468186520532597
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json
@ -6100,7 +6100,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6944540609614009533
+          3097518840997296951
        ]
      ], 
      "bugs": [
@ -6112,7 +6112,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3317112171584676149
+          7316468186520532597
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json
@ -6124,7 +6124,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6944540609614009533
+          3097518840997296951
        ]
      ], 
      "bugs": [
@ -6136,7 +6136,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3317112171584676149
+          7316468186520532597
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json
@ -6124,7 +6124,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6944540609614009533
+          3097518840997296951
        ]
      ], 
      "bugs": [
@ -6136,7 +6136,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3317112171584676149
+          7316468186520532597
        ]
      ], 
      "bugs": [
--- 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
@ -6130,7 +6130,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6944540609614009533
+          3097518840997296951
        ]
      ], 
      "bugs": [
@ -6142,7 +6142,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3317112171584676149
+          7316468186520532597
        ]
      ], 
      "bugs": [
--- 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
@ -6130,7 +6130,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6944540609614009533
+          3097518840997296951
        ]
      ], 
      "bugs": [
@ -6142,7 +6142,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3317112171584676149
+          7316468186520532597
        ]
      ], 
      "bugs": [
--- 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
@ -15273,7 +15273,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5179509558704899159
+          1665207036697331602
        ]
      ], 
      "ignore-failure": false
@ -15282,7 +15282,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10789413709456927550
+          12804134340931910653
        ]
      ], 
      "ignore-failure": false
@ -15291,7 +15291,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12152520647862542658
+          8693932099695153913
        ]
      ], 
      "bugs": [
--- 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
@ -13838,7 +13838,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5179509558704899159
+          1665207036697331602
        ]
      ], 
      "ignore-failure": false
@ -13847,7 +13847,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10789413709456927550
+          12804134340931910653
        ]
      ], 
      "ignore-failure": false
@ -13856,7 +13856,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12152520647862542658
+          8693932099695153913
        ]
      ], 
      "bugs": [
--- 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
@ -15271,7 +15271,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5179509558704899159
+          1665207036697331602
        ]
      ], 
      "ignore-failure": false
@ -15280,7 +15280,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10789413709456927550
+          12804134340931910653
        ]
      ], 
      "ignore-failure": false
@ -15289,7 +15289,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12152520647862542658
+          8693932099695153913
        ]
      ], 
      "bugs": [
--- 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
@ -13043,7 +13043,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5179509558704899159
+          1665207036697331602
        ]
      ], 
      "ignore-failure": false
@ -13052,7 +13052,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10789413709456927550
+          12804134340931910653
        ]
      ], 
      "ignore-failure": false
@ -13061,7 +13061,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12152520647862542658
+          8693932099695153913
        ]
      ], 
      "bugs": [
--- 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
@ -15785,7 +15785,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14112783577155703938
+          11287209491577059906
        ]
      ], 
      "ignore-failure": false
@ -15794,7 +15794,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5551295778185914045
+          610849827880040391
        ]
      ], 
      "ignore-failure": false
@ -15803,7 +15803,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14349317457248382692
+          17189203782066223379
        ]
      ], 
      "ignore-failure": false
--- 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
@ -14427,7 +14427,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14112783577155703938
+          11287209491577059906
        ]
      ], 
      "ignore-failure": false
@ -14436,7 +14436,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5551295778185914045
+          610849827880040391
        ]
      ], 
      "ignore-failure": false
@ -14445,7 +14445,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14349317457248382692
+          17189203782066223379
        ]
      ], 
      "ignore-failure": false
--- 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
@ -15785,7 +15785,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14112783577155703938
+          11287209491577059906
        ]
      ], 
      "ignore-failure": false
@ -15794,7 +15794,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5551295778185914045
+          610849827880040391
        ]
      ], 
      "ignore-failure": false
@ -15803,7 +15803,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14349317457248382692
+          17189203782066223379
        ]
      ], 
      "ignore-failure": false
--- 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
@ -13595,7 +13595,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14112783577155703938
+          11287209491577059906
        ]
      ], 
      "ignore-failure": false
@ -13604,7 +13604,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5551295778185914045
+          610849827880040391
        ]
      ], 
      "ignore-failure": false
@ -13613,7 +13613,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14349317457248382692
+          17189203782066223379
        ]
      ], 
      "ignore-failure": false
--- 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
@ -15259,7 +15259,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14711175471354254404
+          13444808970173033007
        ]
      ], 
      "bugs": [
@ -15271,7 +15271,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7120255925845044195
+          13437526506460114619
        ]
      ], 
      "bugs": [
@ -15283,7 +15283,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5711854275543553930
+          15737364487559488164
        ]
      ], 
      "bugs": [
--- 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
@ -14194,7 +14194,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14711175471354254404
+          13444808970173033007
        ]
      ], 
      "bugs": [
@ -14206,7 +14206,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7120255925845044195
+          13437526506460114619
        ]
      ], 
      "bugs": [
@ -14218,7 +14218,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5711854275543553930
+          15737364487559488164
        ]
      ], 
      "bugs": [
--- 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
@ -15259,7 +15259,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14711175471354254404
+          13444808970173033007
        ]
      ], 
      "bugs": [
@ -15271,7 +15271,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7120255925845044195
+          13437526506460114619
        ]
      ], 
      "bugs": [
@ -15283,7 +15283,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5711854275543553930
+          15737364487559488164
        ]
      ], 
      "bugs": [
--- 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
@ -14643,7 +14643,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14711175471354254404
+          13444808970173033007
        ]
      ], 
      "bugs": [
@ -14655,7 +14655,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7120255925845044195
+          13437526506460114619
        ]
      ], 
      "bugs": [
@ -14667,7 +14667,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5711854275543553930
+          15737364487559488164
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug/expected-results.json
@ -11267,7 +11267,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6982830980037287281
+          18120931637037293931
        ]
      ], 
      "ignore-failure": false
@ -11276,7 +11276,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          13689485175734902201
+          6709336082279713745
        ]
      ], 
      "ignore-failure": false
@ -11285,7 +11285,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11937032237620332938
+          15809889079139336699
        ]
      ], 
      "ignore-failure": false
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Release/expected-results.json
@ -11249,7 +11249,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6982830980037287281
+          18120931637037293931
        ]
      ], 
      "ignore-failure": false
@ -11258,7 +11258,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          13689485175734902201
+          6709336082279713745
        ]
      ], 
      "ignore-failure": false
@ -11267,7 +11267,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11937032237620332938
+          15809889079139336699
        ]
      ], 
      "ignore-failure": false
--- 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
@ -11267,7 +11267,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6982830980037287281
+          18120931637037293931
        ]
      ], 
      "ignore-failure": false
@ -11276,7 +11276,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          13689485175734902201
+          6709336082279713745
        ]
      ], 
      "ignore-failure": false
@ -11285,7 +11285,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11937032237620332938
+          15809889079139336699
        ]
      ], 
      "ignore-failure": false
--- 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
@ -11267,7 +11267,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6982830980037287281
+          18120931637037293931
        ]
      ], 
      "ignore-failure": false
@ -11276,7 +11276,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          13689485175734902201
+          6709336082279713745
        ]
      ], 
      "ignore-failure": false
@ -11285,7 +11285,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11937032237620332938
+          15809889079139336699
        ]
      ], 
      "ignore-failure": false
--- 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
@ -9955,7 +9955,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6982830980037287281
+          18120931637037293931
        ]
      ], 
      "ignore-failure": false
@ -9964,7 +9964,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          13689485175734902201
+          6709336082279713745
        ]
      ], 
      "ignore-failure": false
--- 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
@ -12272,7 +12272,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6982830980037287281
+          18120931637037293931
        ]
      ], 
      "bugs": [
@ -12284,7 +12284,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          13689485175734902201
+          6709336082279713745
        ]
      ], 
      "bugs": [
@ -12296,7 +12296,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2155130015547768759
+          17658257318707926795
        ]
      ], 
      "bugs": [
--- 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
@ -14982,7 +14982,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16192049980676332176
+          1479116357727804239
        ]
      ], 
      "bugs": [
@ -14994,7 +14994,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1450874120063337731
+          17744727655126998812
        ]
      ], 
      "bugs": [
@ -15006,7 +15006,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          912346573508076753
+          8785170447147063713
        ]
      ], 
      "bugs": [
@ -15018,7 +15018,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10563373348169726276
+          12421287546540698026
        ]
      ], 
      "bugs": [
--- 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
@ -11339,7 +11339,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7588447546847665667
+          16924304794833816968
        ]
      ], 
      "ignore-failure": false
@ -11348,7 +11348,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4529330764736436516
+          14709336717565174668
        ]
      ], 
      "ignore-failure": false
@ -11357,7 +11357,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3343710780946218843
+          15042349468177411621
        ]
      ], 
      "ignore-failure": false
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
@ -11345,7 +11345,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16192049980676332176
+          1479116357727804239
        ]
      ], 
      "ignore-failure": false
@ -11354,7 +11354,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1450874120063337731
+          17744727655126998812
        ]
      ], 
      "ignore-failure": false
@ -11363,7 +11363,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10563373348169726276
+          12421287546540698026
        ]
      ], 
      "ignore-failure": false
--- 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
@ -14974,7 +14974,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16192049980676332176
+          1479116357727804239
        ]
      ], 
      "bugs": [
@ -14986,7 +14986,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1450874120063337731
+          17744727655126998812
        ]
      ], 
      "bugs": [
@ -14998,7 +14998,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          912346573508076753
+          8785170447147063713
        ]
      ], 
      "bugs": [
@ -15010,7 +15010,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10563373348169726276
+          12421287546540698026
        ]
      ], 
      "bugs": [
--- 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
@ -11331,7 +11331,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7588447546847665667
+          16924304794833816968
        ]
      ], 
      "ignore-failure": false
@ -11340,7 +11340,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4529330764736436516
+          14709336717565174668
        ]
      ], 
      "ignore-failure": false
@ -11349,7 +11349,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3343710780946218843
+          15042349468177411621
        ]
      ], 
      "ignore-failure": false
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
@ -11337,7 +11337,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16192049980676332176
+          1479116357727804239
        ]
      ], 
      "ignore-failure": false
@ -11346,7 +11346,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1450874120063337731
+          17744727655126998812
        ]
      ], 
      "ignore-failure": false
@ -11355,7 +11355,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10563373348169726276
+          12421287546540698026
        ]
      ], 
      "ignore-failure": false
--- 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
@ -11337,7 +11337,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16192049980676332176
+          1479116357727804239
        ]
      ], 
      "ignore-failure": false
@ -11346,7 +11346,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1450874120063337731
+          17744727655126998812
        ]
      ], 
      "ignore-failure": false
@ -11355,7 +11355,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10563373348169726276
+          12421287546540698026
        ]
      ], 
      "ignore-failure": false
--- 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
@ -11337,7 +11337,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16192049980676332176
+          1479116357727804239
        ]
      ], 
      "ignore-failure": false
@ -11346,7 +11346,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1450874120063337731
+          17744727655126998812
        ]
      ], 
      "ignore-failure": false
@ -11355,7 +11355,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10563373348169726276
+          12421287546540698026
        ]
      ], 
      "ignore-failure": false
--- a/expectations/gm/ignored-tests.txt
+++ b/expectations/gm/ignored-tests.txt
@ -66,6 +66,3 @@ clipped-bitmap-shaders-tile-hq_gpu
 clipped-bitmap-shaders-clamp-hq_angle
 clipped-bitmap-shaders-mirror-hq_angle
 clipped-bitmap-shaders-tile-hq_angle
-
-# Added by senorblanco to accomodate bounds fixes for SkXfermodeImageFilter in https://codereview.chromium.org/112683004.
-xfermodeimagefilter