Rebaseline morphology GM after https://skia.googlesource.com/skia.git/+/3b64f20423a2bfc454cd569594d78f4169756764

TBR=epoger Review URL: https://codereview.chromium.org/23600064 git-svn-id: http://skia.googlecode.com/svn/trunk@11315 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-17 15:14:46 +00:00 · 2013-09-17 15:14:46 +00:00 · e1e084f102
commit e1e084f102
parent 257b8c2646
24 changed files with 84 additions and 84 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
@ -4591,7 +4591,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          17733638473801952159
+          964014980891672323
        ]
      ], 
      "ignore-failure": false
@ -4600,7 +4600,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14807937023473744551
+          3692851439558283969
        ]
      ], 
      "ignore-failure": false
--- a/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
@ -5862,7 +5862,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5879158730713954575
+          6526898598632434468
        ]
      ], 
      "bugs": [
@ -5874,7 +5874,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2622266009798656719
+          14644933624381601288
        ]
      ], 
      "bugs": [
@ -5886,7 +5886,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2622266009798656719
+          2806472454232486046
        ]
      ], 
      "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
@ -4615,7 +4615,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5879158730713954575
+          6526898598632434468
        ]
      ], 
      "ignore-failure": false
@ -4624,7 +4624,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2622266009798656719
+          14644933624381601288
        ]
      ], 
      "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
@ -4615,7 +4615,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5879158730713954575
+          6526898598632434468
        ]
      ], 
      "ignore-failure": false
@ -4624,7 +4624,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2622266009798656719
+          14644933624381601288
        ]
      ], 
      "ignore-failure": false
--- a/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json
@ -4276,7 +4276,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11776199753315161997
+          97067489852953072
        ]
      ], 
      "bugs": [
@ -4288,7 +4288,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5473817800436527882
+          9842147070514749318
        ]
      ], 
      "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
@ -4276,7 +4276,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11776199753315161997
+          97067489852953072
        ]
      ], 
      "bugs": [
@ -4288,7 +4288,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5473817800436527882
+          9842147070514749318
        ]
      ], 
      "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
@ -4276,7 +4276,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11776199753315161997
+          97067489852953072
        ]
      ], 
      "bugs": [
@ -4288,7 +4288,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5473817800436527882
+          9842147070514749318
        ]
      ], 
      "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
@ -4276,7 +4276,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11776199753315161997
+          97067489852953072
        ]
      ], 
      "bugs": [
@ -4288,7 +4288,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5473817800436527882
+          9842147070514749318
        ]
      ], 
      "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
@ -10890,7 +10890,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          15741935338310623106
+          7373435595375698571
        ]
      ], 
      "ignore-failure": false
@ -10899,7 +10899,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10742842981042542942
+          15374102196967952984
        ]
      ], 
      "ignore-failure": false
@ -10908,7 +10908,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10742842981042542942
+          7069327312527997744
        ]
      ], 
      "ignore-failure": false
@ -10935,7 +10935,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14019724548390813192
+          15039257142671483791
        ]
      ], 
      "ignore-failure": false
@ -10944,7 +10944,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7652429797249478326
+          9062803366680991845
        ]
      ], 
      "bugs": [
--- 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
@ -9481,7 +9481,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          15741935338310623106
+          7373435595375698571
        ]
      ], 
      "ignore-failure": false
@ -9490,7 +9490,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10742842981042542942
+          15374102196967952984
        ]
      ], 
      "ignore-failure": false
@ -9499,7 +9499,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10742842981042542942
+          7069327312527997744
        ]
      ], 
      "ignore-failure": false
@ -9526,7 +9526,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14019724548390813192
+          15039257142671483791
        ]
      ], 
      "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
@ -10890,7 +10890,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          15741935338310623106
+          7373435595375698571
        ]
      ], 
      "ignore-failure": false
@ -10899,7 +10899,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10742842981042542942
+          15374102196967952984
        ]
      ], 
      "ignore-failure": false
@ -10908,7 +10908,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10742842981042542942
+          7069327312527997744
        ]
      ], 
      "ignore-failure": false
@ -10935,7 +10935,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14019724548390813192
+          15039257142671483791
        ]
      ], 
      "ignore-failure": false
@ -10944,7 +10944,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7652429797249478326
+          9062803366680991845
        ]
      ], 
      "bugs": [
--- 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
@ -9169,7 +9169,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          15741935338310623106
+          7373435595375698571
        ]
      ], 
      "ignore-failure": false
@ -9178,7 +9178,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10742842981042542942
+          15374102196967952984
        ]
      ], 
      "ignore-failure": false
@ -9187,7 +9187,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10742842981042542942
+          7069327312527997744
        ]
      ], 
      "ignore-failure": false
@ -9214,7 +9214,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14019724548390813192
+          15039257142671483791
        ]
      ], 
      "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
@ -10643,7 +10643,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12400911949706363725
+          12753756169688903836
        ]
      ], 
      "bugs": [
@ -10655,7 +10655,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3291655743837119625
+          914753315356783444
        ]
      ], 
      "bugs": [
@ -10667,7 +10667,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3291655743837119625
+          1144395464248598958
        ]
      ], 
      "bugs": [
@ -10679,7 +10679,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          15562776184614408476
+          8613701463298305732
        ]
      ], 
      "bugs": [
@ -10691,7 +10691,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1291783280068888502
+          6207552896930867721
        ]
      ], 
      "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
@ -9323,7 +9323,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12400911949706363725
+          12753756169688903836
        ]
      ], 
      "bugs": [
@ -9335,7 +9335,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3291655743837119625
+          914753315356783444
        ]
      ], 
      "bugs": [
@ -9347,7 +9347,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3291655743837119625
+          1144395464248598958
        ]
      ], 
      "bugs": [
@ -9359,7 +9359,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          15562776184614408476
+          8613701463298305732
        ]
      ], 
      "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
@ -10643,7 +10643,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14331629763748964901
+          1528813877230699035
        ]
      ], 
      "bugs": [
@ -10655,7 +10655,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8711612427571312639
+          3091907427533749622
        ]
      ], 
      "bugs": [
@ -10667,7 +10667,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8711612427571312639
+          14959506955507525285
        ]
      ], 
      "bugs": [
@ -10679,7 +10679,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10525294196321752886
+          13453333591687643395
        ]
      ], 
      "bugs": [
@ -10691,7 +10691,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12060287915568896613
+          3794408533349529420
        ]
      ], 
      "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
@ -8951,7 +8951,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14331629763748964901
+          1528813877230699035
        ]
      ], 
      "bugs": [
@ -8963,7 +8963,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8711612427571312639
+          3091907427533749622
        ]
      ], 
      "bugs": [
@ -8975,7 +8975,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8711612427571312639
+          14959506955507525285
        ]
      ], 
      "bugs": [
@ -8987,7 +8987,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10525294196321752886
+          13453333591687643395
        ]
      ], 
      "bugs": [
--- 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
@ -6890,7 +6890,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6003958271174346658
+          13112348861717911228
        ]
      ], 
      "ignore-failure": false
@ -6899,7 +6899,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1268807100506439038
+          4461495541849717109
        ]
      ], 
      "ignore-failure": false
@ -6917,7 +6917,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11433243025901093822
+          15089079208206756723
        ]
      ], 
      "bugs": [
--- 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
@ -8537,7 +8537,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6003958271174346658
+          13112348861717911228
        ]
      ], 
      "bugs": [
@ -8549,7 +8549,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1268807100506439038
+          4461495541849717109
        ]
      ], 
      "bugs": [
@ -8561,7 +8561,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1268807100506439038
+          2872574959384675617
        ]
      ], 
      "bugs": [
@ -8573,7 +8573,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11433243025901093822
+          15089079208206756723
        ]
      ], 
      "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
@ -7813,7 +7813,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          161335792809857237
+          12549360642438897235
        ]
      ], 
      "ignore-failure": false
@ -7822,7 +7822,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12474442051338988377
+          17476718297850315478
        ]
      ], 
      "ignore-failure": false
@ -7831,7 +7831,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12474442051338988377
+          15753416375761750628
        ]
      ], 
      "ignore-failure": false
@ -7840,7 +7840,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          13082803464346819459
+          16854423898679382966
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
@ -7801,7 +7801,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          17576181873643015363
+          17760550325133832457
        ]
      ], 
      "ignore-failure": false
@ -7810,7 +7810,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          18169330679722554103
+          7291056034091925663
        ]
      ], 
      "ignore-failure": false
@ -7819,7 +7819,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          18169330679722554103
+          1584665561543982986
        ]
      ], 
      "ignore-failure": false
@ -7828,7 +7828,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14869814879014699806
+          4038062626373661336
        ]
      ], 
      "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
@ -7813,7 +7813,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          161335792809857237
+          12549360642438897235
        ]
      ], 
      "ignore-failure": false
@ -7822,7 +7822,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12474442051338988377
+          17476718297850315478
        ]
      ], 
      "ignore-failure": false
@ -7831,7 +7831,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12474442051338988377
+          15753416375761750628
        ]
      ], 
      "ignore-failure": false
@ -7840,7 +7840,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          13082803464346819459
+          16854423898679382966
        ]
      ], 
      "bugs": [
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
@ -7801,7 +7801,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          17576181873643015363
+          17760550325133832457
        ]
      ], 
      "ignore-failure": false
@ -7810,7 +7810,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          18169330679722554103
+          7291056034091925663
        ]
      ], 
      "ignore-failure": false
@ -7819,7 +7819,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          18169330679722554103
+          1584665561543982986
        ]
      ], 
      "ignore-failure": false
@ -7828,7 +7828,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14869814879014699806
+          4038062626373661336
        ]
      ], 
      "bugs": [
--- 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
@ -7801,7 +7801,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          17576181873643015363
+          17760550325133832457
        ]
      ], 
      "ignore-failure": false
@ -7810,7 +7810,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          18169330679722554103
+          7291056034091925663
        ]
      ], 
      "ignore-failure": false
@ -7819,7 +7819,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          18169330679722554103
+          1584665561543982986
        ]
      ], 
      "ignore-failure": false
@ -7828,7 +7828,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14869814879014699806
+          4038062626373661336
        ]
      ], 
      "bugs": [
--- 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
@ -7801,7 +7801,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          17576181873643015363
+          17760550325133832457
        ]
      ], 
      "ignore-failure": false
@ -7810,7 +7810,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          18169330679722554103
+          7291056034091925663
        ]
      ], 
      "ignore-failure": false
@ -7819,7 +7819,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          18169330679722554103
+          1584665561543982986
        ]
      ], 
      "ignore-failure": false
@ -7828,7 +7828,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14869814879014699806
+          4038062626373661336
        ]
      ], 
      "bugs": [