rebase and update ignore

TBR= NOTRY=True BUG=skia: Review URL: https://codereview.chromium.org/816963002
2014-12-19 06:47:19 -08:00 · 2014-12-19 06:47:19 -08:00 · 0cd35a24f2
commit 0cd35a24f2
parent aa9513d705
36 changed files with 65 additions and 69 deletions
--- a/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Debug/expected-results.json
@ -311,7 +311,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          15766681043988193090
+          2650683721507759501
        ]
      ], 
      "reviewed-by-human": true
@ -623,7 +623,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          776288504018548234
+          12629194803277348198
        ]
      ], 
      "reviewed-by-human": true
@ -659,7 +659,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          15615248773774769428
+          15617959914897342675
        ]
      ], 
      "reviewed-by-human": true
@ -5902,7 +5902,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          9787659696424703822
+          361812456406573002
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Release/expected-results.json
@ -311,7 +311,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          13833548900611901950
+          2650683721507759501
        ]
      ], 
      "reviewed-by-human": true
@ -623,7 +623,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          776288504018548234
+          12629194803277348198
        ]
      ], 
      "reviewed-by-human": true
@ -5894,7 +5894,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6964092336455472164
+          12648157165719018015
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
@ -548,7 +548,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11110071386674013004
+          13819670045284689195
        ]
      ], 
      "reviewed-by-human": true
@ -1082,7 +1082,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12876711069951254532
+          12050031911358455324
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
@ -445,7 +445,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11110071386674013004
+          13819670045284689195
        ]
      ], 
      "reviewed-by-human": true
@ -880,7 +880,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12876711069951254532
+          12050031911358455324
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Debug/expected-results.json
@ -334,7 +334,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12186349305207417968
+          2537723795868872847
        ]
      ], 
      "ignore-failure": true, 
@ -683,7 +683,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7811823007056608781
+          15007119644418172838
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Release/expected-results.json
@ -334,7 +334,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12186349305207417968
+          2537723795868872847
        ]
      ], 
      "ignore-failure": true, 
@ -683,7 +683,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7811823007056608781
+          15007119644418172838
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
@ -338,7 +338,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11976769394076607440
+          4250069321180031584
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
@ -350,7 +350,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10972939966027239488
+          11336253280318702322
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
@ -350,7 +350,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10972939966027239488
+          11336253280318702322
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json
@ -6498,7 +6498,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          335739214192474542
+          12328881699324455297
        ]
      ], 
      "reviewed-by-human": true
@ -6507,7 +6507,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5652577089689509120
+          7086183781783873099
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -622,7 +622,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8741984205182434161
+          3635090355061860852
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -538,7 +538,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8741984205182434161
+          3635090355061860852
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -622,7 +622,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8741984205182434161
+          3635090355061860852
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -538,7 +538,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8741984205182434161
+          3635090355061860852
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -586,7 +586,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8741984205182434161
+          3635090355061860852
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -602,7 +602,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8741984205182434161
+          3635090355061860852
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Mac10.9-MacMini6.2-HD4000-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.9-MacMini6.2-HD4000-x86_64-Debug/expected-results.json
@ -569,7 +569,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14351262937459160208
+          17155346542840678373
        ]
      ], 
      "reviewed-by-human": true
@ -1191,7 +1191,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          13630906366099159946
+          17790074904211993207
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Mac10.9-MacMini6.2-HD4000-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.9-MacMini6.2-HD4000-x86_64-Release/expected-results.json
@ -585,7 +585,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14351262937459160208
+          17155346542840678373
        ]
      ], 
      "reviewed-by-human": true
@ -1255,7 +1255,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          13630906366099159946
+          17790074904211993207
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json
@ -741,7 +741,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8741984205182434161
+          3635090355061860852
        ]
      ], 
      "reviewed-by-human": true
@ -1494,7 +1494,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8030168239881559492
+          567570867373091171
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json
@ -741,7 +741,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8741984205182434161
+          3635090355061860852
        ]
      ], 
      "reviewed-by-human": true
@ -1493,7 +1493,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8030168239881559492
+          567570867373091171
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug/expected-results.json
@ -775,7 +775,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8741984205182434161
+          3635090355061860852
        ]
      ], 
      "reviewed-by-human": true
@ -1547,7 +1547,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8030168239881559492
+          567570867373091171
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/expected-results.json
@ -775,7 +775,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8741984205182434161
+          3635090355061860852
        ]
      ], 
      "reviewed-by-human": true
@ -1547,7 +1547,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8030168239881559492
+          567570867373091171
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -568,7 +568,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7784555326813513893
+          13990211595606495714
        ]
      ], 
      "reviewed-by-human": true
@ -1187,7 +1187,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7595902078530268040
+          8446131270101550803
        ]
      ], 
      "reviewed-by-human": true
@ -14046,7 +14046,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14259084747229232786
+          16247834823762474386
        ]
      ], 
      "reviewed-by-human": 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
@ -477,7 +477,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14351262937459160208
+          17155346542840678373
        ]
      ], 
      "reviewed-by-human": true
@ -967,7 +967,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7116235367842840302
+          8283583615256449889
        ]
      ], 
      "reviewed-by-human": 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
@ -568,7 +568,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7784555326813513893
+          13990211595606495714
        ]
      ], 
      "reviewed-by-human": true
@ -1187,7 +1187,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7595902078530268040
+          8446131270101550803
        ]
      ], 
      "reviewed-by-human": 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
@ -476,7 +476,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14351262937459160208
+          17155346542840678373
        ]
      ], 
      "reviewed-by-human": true
@ -977,7 +977,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7116235367842840302
+          8283583615256449889
        ]
      ], 
      "reviewed-by-human": 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
@ -476,7 +476,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14351262937459160208
+          17155346542840678373
        ]
      ], 
      "reviewed-by-human": true
@ -977,7 +977,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7116235367842840302
+          8283583615256449889
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json
@ -736,7 +736,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8741984205182434161
+          3635090355061860852
        ]
      ], 
      "reviewed-by-human": true
@ -1489,7 +1489,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8030168239881559492
+          567570867373091171
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json
@ -736,7 +736,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8741984205182434161
+          3635090355061860852
        ]
      ], 
      "reviewed-by-human": true
@ -1489,7 +1489,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8030168239881559492
+          567570867373091171
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -736,7 +736,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8741984205182434161
+          3635090355061860852
        ]
      ], 
      "reviewed-by-human": true
@ -1489,7 +1489,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8030168239881559492
+          567570867373091171
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -736,7 +736,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8741984205182434161
+          3635090355061860852
        ]
      ], 
      "reviewed-by-human": true
@ -1489,7 +1489,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8030168239881559492
+          567570867373091171
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Debug/expected-results.json
@ -478,7 +478,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7097626952679229344
+          9800611817077103846
        ]
      ], 
      "reviewed-by-human": true
@ -979,7 +979,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5326744486430792004
+          1313576106348568237
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Release/expected-results.json
@ -478,7 +478,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7097626952679229344
+          9800611817077103846
        ]
      ], 
      "reviewed-by-human": true
@ -979,7 +979,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5326744486430792004
+          1313576106348568237
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -478,7 +478,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7097626952679229344
+          9800611817077103846
        ]
      ], 
      "reviewed-by-human": true
@ -979,7 +979,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5326744486430792004
+          1313576106348568237
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -478,7 +478,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7097626952679229344
+          9800611817077103846
        ]
      ], 
      "reviewed-by-human": true
@ -979,7 +979,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5326744486430792004
+          1313576106348568237
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/ignored-tests.txt
+++ b/expectations/gm/ignored-tests.txt
@ -59,7 +59,3 @@ drawbitmapmatrix

 #junov skbug.com/3176
 pictureimagefilter
-
-#joshualitt
-bleed
-bigblurs