Rebaseline complexclip tests on GPU and remove them from ignored-tests

Review URL: https://codereview.chromium.org/27515002 git-svn-id: http://skia.googlecode.com/svn/trunk@11806 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-10-16 14:15:32 +00:00 · 2013-10-16 14:15:32 +00:00 · e4d3d7ca70
commit e4d3d7ca70
parent 6397217b30
22 changed files with 42 additions and 47 deletions
--- a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
@ -3262,7 +3262,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16324695462715954732
+          16863835388224865568
        ]
      ], 
      "bugs": [
@ -3298,7 +3298,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          235647952836592860
+          14763563563821323023
        ]
      ], 
      "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
@ -3262,7 +3262,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16324695462715954732
+          16863835388224865568
        ]
      ], 
      "bugs": [
@ -3298,7 +3298,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          235647952836592860
+          14763563563821323023
        ]
      ], 
      "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
@ -2605,7 +2605,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          9249393951961418206
+          15887733356974503174
        ]
      ], 
      "ignore-failure": false
@ -2638,7 +2638,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6873622463422452934
+          15528435480006183945
        ]
      ], 
      "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
@ -2593,7 +2593,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          9249393951961418206
+          15887733356974503174
        ]
      ], 
      "ignore-failure": false
@ -2626,7 +2626,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6873622463422452934
+          15528435480006183945
        ]
      ], 
      "ignore-failure": false
--- a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
@ -2407,7 +2407,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5801460571097397495
+          1816495870691332166
        ]
      ], 
      "ignore-failure": false
@ -2434,7 +2434,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7249032829120956964
+          11166874807637634446
        ]
      ], 
      "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
@ -2407,7 +2407,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5801460571097397495
+          1816495870691332166
        ]
      ], 
      "ignore-failure": false
@ -2434,7 +2434,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7249032829120956964
+          11166874807637634446
        ]
      ], 
      "ignore-failure": false
--- 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
@ -4609,7 +4609,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14791964207482215720
+          5459826871277147448
        ]
      ], 
      "ignore-failure": false
@ -4636,7 +4636,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6742010774615864416
+          5725891805559839757
        ]
      ], 
      "ignore-failure": false
--- 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
@ -4948,7 +4948,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3279767288317951464
+          17561903083126099983
        ]
      ], 
      "ignore-failure": false
@ -4975,7 +4975,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3994792385541458911
+          2259819085307305968
        ]
      ], 
      "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
@ -4948,7 +4948,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3279767288317951464
+          17561903083126099983
        ]
      ], 
      "ignore-failure": false
@ -4975,7 +4975,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3994792385541458911
+          2259819085307305968
        ]
      ], 
      "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
@ -4060,7 +4060,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3279767288317951464
+          17561903083126099983
        ]
      ], 
      "ignore-failure": false
@ -4087,7 +4087,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3994792385541458911
+          2259819085307305968
        ]
      ], 
      "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
@ -4798,7 +4798,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5630088657378777462
+          2940167790422030421
        ]
      ], 
      "bugs": [
@ -4834,7 +4834,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          9058855747766203268
+          9425661583172461579
        ]
      ], 
      "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
@ -4798,7 +4798,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5630088657378777462
+          2940167790422030421
        ]
      ], 
      "bugs": [
@ -4834,7 +4834,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          9058855747766203268
+          9425661583172461579
        ]
      ], 
      "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
@ -3844,7 +3844,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4077774267275217943
+          2514565554373230935
        ]
      ], 
      "bugs": [
@ -3880,7 +3880,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7478346618978478981
+          5175669850739416288
        ]
      ], 
      "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
@ -4657,7 +4657,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1923469321359458653
+          10553033795329414251
        ]
      ], 
      "bugs": [
@ -4702,7 +4702,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          9353025390902152458
+          5901998089106771468
        ]
      ], 
      "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
@ -3487,7 +3487,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12615109074496975808
+          11428084010602305449
        ]
      ], 
      "ignore-failure": false
@ -3514,7 +3514,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16413003550520501420
+          14818096265358525526
        ]
      ], 
      "ignore-failure": true
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
@ -3469,7 +3469,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1923469321359458653
+          10553033795329414251
        ]
      ], 
      "ignore-failure": false
@ -3496,7 +3496,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8714527708726502184
+          5901998089106771468
        ]
      ], 
      "ignore-failure": true
--- 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
@ -4657,7 +4657,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1923469321359458653
+          10553033795329414251
        ]
      ], 
      "bugs": [
@ -4702,7 +4702,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          9353025390902152458
+          5901998089106771468
        ]
      ], 
      "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
@ -3487,7 +3487,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12615109074496975808
+          11428084010602305449
        ]
      ], 
      "ignore-failure": false
@ -3514,7 +3514,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16413003550520501420
+          14818096265358525526
        ]
      ], 
      "ignore-failure": true
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
@ -3496,7 +3496,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8714527708726502184
+          5901998089106771468
        ]
      ], 
      "ignore-failure": true
--- 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
@ -3340,7 +3340,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12801179152774323055
+          17466340906393277711
        ]
      ], 
      "ignore-failure": true
@ -3469,7 +3469,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10098164766930591642
+          2170651913455684026
        ]
      ], 
      "ignore-failure": false
@ -3496,7 +3496,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8714527708726502184
+          16476642359469672869
        ]
      ], 
      "ignore-failure": true
--- 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
@ -3340,7 +3340,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12801179152774323055
+          17466340906393277711
        ]
      ], 
      "ignore-failure": true
@ -3496,7 +3496,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8714527708726502184
+          16476642359469672869
        ]
      ], 
      "ignore-failure": true
--- a/expectations/gm/ignored-tests.txt
+++ b/expectations/gm/ignored-tests.txt
@ -34,8 +34,3 @@ pdf-poppler
 # Added by senorblanco as part of https://codereview.chromium.org/26531002/.
 # New test cases added; will need rebaseline.
 displacement
-
-# Added by bsalomon as part of https://codereview.chromium.org/27170003/
-# images differ in lsb
-complexclip_aa_gpu
-complexclip_aa_layer_gpu