From 22c9ae18e28d9d5bf5ec91019650a802b9441776 Mon Sep 17 00:00:00 2001 From: reed Date: Fri, 5 Dec 2014 09:18:27 -0800 Subject: [PATCH] rebaseline after change to imagefilterscropped gm change BUG=skia: NOTRY=True TBR= Review URL: https://codereview.chromium.org/779313002 --- .../expected-results.json | 4 +-- .../expected-results.json | 4 +-- .../expected-results.json | 4 +-- .../expected-results.json | 4 +-- .../expected-results.json | 2 +- .../expected-results.json | 2 +- .../expected-results.json | 2 +- .../expected-results.json | 2 +- .../expected-results.json | 2 +- .../expected-results.json | 17 ++++++----- .../expected-results.json | 17 ++++++----- .../expected-results.json | 17 ++++++----- .../expected-results.json | 17 ++++++----- .../expected-results.json | 23 +++++---------- .../expected-results.json | 23 +++++---------- .../expected-results.json | 28 ++++++++----------- .../expected-results.json | 28 ++++++++----------- .../expected-results.json | 28 ++++++++----------- .../expected-results.json | 28 ++++++++----------- 19 files changed, 115 insertions(+), 137 deletions(-) diff --git a/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Debug/expected-results.json index c84c89239a..11ec2a51d5 100644 --- a/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Debug/expected-results.json +++ b/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Debug/expected-results.json @@ -6043,10 +6043,10 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 5040757535335650688 + 612092832801010869 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "imagefilterscropped_msaa4.png": { "allowed-digests": [ diff --git a/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Release/expected-results.json index 56cf050315..cf10a8f39b 100644 --- a/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Release/expected-results.json +++ b/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Release/expected-results.json @@ -6035,10 +6035,10 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 5040757535335650688 + 612092832801010869 ] ], - "reviewed-by-human": false + "reviewed-by-human": true }, "imagefilterscropped_msaa4.png": { "allowed-digests": [ 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 1a72d54732..cd53336841 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 @@ -10256,7 +10256,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 8741233039690061684 + 4310348839500155470 ] ], "reviewed-by-human": true @@ -10274,7 +10274,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 5523411567262382106 + 17017151673559757126 ] ], "reviewed-by-human": true 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 08125d0c67..928eb737fd 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 @@ -8662,7 +8662,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 8741233039690061684 + 4310348839500155470 ] ], "reviewed-by-human": true @@ -8671,7 +8671,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 5523411567262382106 + 17017151673559757126 ] ], "reviewed-by-human": true diff --git a/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Debug/expected-results.json index cc7b6ea7bd..64b918c720 100644 --- a/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Debug/expected-results.json +++ b/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Debug/expected-results.json @@ -6765,7 +6765,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 13054541218806395094 + 10990338259713303207 ] ], "reviewed-by-human": true diff --git a/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Release/expected-results.json index cc7b6ea7bd..64b918c720 100644 --- a/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Release/expected-results.json +++ b/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Release/expected-results.json @@ -6765,7 +6765,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 13054541218806395094 + 10990338259713303207 ] ], "reviewed-by-human": true 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 b59a77d460..22c00b970f 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 @@ -6436,7 +6436,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 13244948132740302228 + 5051708950412287217 ] ], "reviewed-by-human": true 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 3c159ad11c..b581624d2b 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 @@ -6440,7 +6440,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 13244948132740302228 + 5051708950412287217 ] ], "reviewed-by-human": true 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 4fd4558901..05b292e5cf 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 @@ -6484,7 +6484,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 856993718612531024 + 9981204241980613841 ] ], "reviewed-by-human": true 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 8105b2d0bf..f5e73d6359 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 @@ -11561,31 +11561,34 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 5475221364402386754 + 16153447456050350837 ] - ] + ], + "reviewed-by-human": true }, "imagefilterscropped_8888.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 14576969020116116866 + 4416245546533973764 ] - ] + ], + "reviewed-by-human": true }, "imagefilterscropped_gpu.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 4082919817351863195 + 7576644503959445875 ] - ] + ], + "reviewed-by-human": true }, "imagefilterscropped_pdf-mac.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 8586295680495406288 + 17205581205236568576 ] ], "ignore-failure": false, 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 f44e90707b..f447de62ae 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 @@ -10067,31 +10067,34 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 5475221364402386754 + 16153447456050350837 ] - ] + ], + "reviewed-by-human": true }, "imagefilterscropped_8888.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 14576969020116116866 + 4416245546533973764 ] - ] + ], + "reviewed-by-human": true }, "imagefilterscropped_gpu.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 4082919817351863195 + 7576644503959445875 ] - ] + ], + "reviewed-by-human": true }, "imagefilterscropped_pdf-mac.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 8586295680495406288 + 17205581205236568576 ] ], "ignore-failure": false, 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 56340a8bbd..3f5fc92b0a 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 @@ -11960,25 +11960,28 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 3523597383091799125 + 1495325002539451100 ] - ] + ], + "reviewed-by-human": true }, "imagefilterscropped_8888.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 12689635892734962203 + 17900593092678404644 ] - ] + ], + "reviewed-by-human": true }, "imagefilterscropped_gpu.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 14524592360975847383 + 10004055593336317342 ] - ] + ], + "reviewed-by-human": true }, "imagefilterscropped_mesa.png": { "allowed-digests": [ @@ -11992,7 +11995,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 10046268867666762370 + 17327715824576436420 ] ], "ignore-failure": false, 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 7409bfcf2f..a840cb8693 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 @@ -10485,25 +10485,28 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 3523597383091799125 + 1495325002539451100 ] - ] + ], + "reviewed-by-human": true }, "imagefilterscropped_8888.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 12689635892734962203 + 17900593092678404644 ] - ] + ], + "reviewed-by-human": true }, "imagefilterscropped_gpu.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 14524592360975847383 + 10004055593336317342 ] - ] + ], + "reviewed-by-human": true }, "imagefilterscropped_mesa.png": { "allowed-digests": [ @@ -10517,7 +10520,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 10046268867666762370 + 17327715824576436420 ] ], "ignore-failure": false, 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 ee49203fa4..7249c5356e 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 @@ -11279,43 +11279,34 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 12882268055888474705 + 3804178048221224942 ] ], - "bugs": [ - 1578 - ], - "reviewed-by-human": false + "reviewed-by-human": true }, "imagefilterscropped_8888.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 8923283586173668076 + 13239694158602020644 ] ], - "bugs": [ - 1578 - ], - "reviewed-by-human": false + "reviewed-by-human": true }, "imagefilterscropped_gpu.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 11946332552345328115 + 16958898458307668534 ] ], - "bugs": [ - 1578 - ], - "reviewed-by-human": false + "reviewed-by-human": true }, "imagefilterscropped_pdf-mac.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 2713820904424477952 + 6933333471994521402 ] ], "ignore-failure": false, 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 5cd24a3207..30720fd63e 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 @@ -12019,43 +12019,34 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 12882268055888474705 + 3804178048221224942 ] ], - "bugs": [ - 1578 - ], - "reviewed-by-human": false + "reviewed-by-human": true }, "imagefilterscropped_8888.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 8923283586173668076 + 13239694158602020644 ] ], - "bugs": [ - 1578 - ], - "reviewed-by-human": false + "reviewed-by-human": true }, "imagefilterscropped_gpu.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 11946332552345328115 + 16958898458307668534 ] ], - "bugs": [ - 1578 - ], - "reviewed-by-human": false + "reviewed-by-human": true }, "imagefilterscropped_pdf-mac.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 2713820904424477952 + 6933333471994521402 ] ], "ignore-failure": false, diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json index d47221a51a..a0b8fcd68b 100644 --- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json +++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json @@ -13648,47 +13648,43 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 11640669486244643201 + 16542120625365055907 ] - ] + ], + "reviewed-by-human": true }, "imagefilterscropped_8888.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 12644236474180508699 + 16506604652894367079 ] - ] + ], + "reviewed-by-human": true }, "imagefilterscropped_gpu.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 5203354974493284242 + 3296718973590080726 ] ], - "bugs": [ - 2325 - ], - "reviewed-by-human": false + "reviewed-by-human": true }, "imagefilterscropped_msaa16.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 12640089095135714872 + 17913962461417001295 ] ], - "bugs": [ - 2325 - ], - "reviewed-by-human": false + "reviewed-by-human": true }, "imagefilterscropped_nvprmsaa4.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 10202019670274831016 + 2214074105283093581 ] ], "reviewed-by-human": true @@ -13697,7 +13693,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 25990893730353865 + 1188078468842090523 ] ], "reviewed-by-human": true diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json index f41a7bde90..a7f724479c 100644 --- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json +++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json @@ -13771,47 +13771,43 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 11640669486244643201 + 16542120625365055907 ] - ] + ], + "reviewed-by-human": true }, "imagefilterscropped_8888.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 12644236474180508699 + 16506604652894367079 ] - ] + ], + "reviewed-by-human": true }, "imagefilterscropped_gpu.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 5203354974493284242 + 3296718973590080726 ] ], - "bugs": [ - 2325 - ], - "reviewed-by-human": false + "reviewed-by-human": true }, "imagefilterscropped_msaa16.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 12640089095135714872 + 17913962461417001295 ] ], - "bugs": [ - 2325 - ], - "reviewed-by-human": false + "reviewed-by-human": true }, "imagefilterscropped_nvprmsaa4.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 10202019670274831016 + 2214074105283093581 ] ], "reviewed-by-human": true @@ -13820,7 +13816,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 25990893730353865 + 1188078468842090523 ] ], "reviewed-by-human": true diff --git 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 index 616691cbfb..7a27386141 100644 --- 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 @@ -13746,47 +13746,43 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 11640669486244643201 + 16542120625365055907 ] - ] + ], + "reviewed-by-human": true }, "imagefilterscropped_8888.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 12644236474180508699 + 16506604652894367079 ] - ] + ], + "reviewed-by-human": true }, "imagefilterscropped_gpu.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 5203354974493284242 + 3296718973590080726 ] ], - "bugs": [ - 2325 - ], - "reviewed-by-human": false + "reviewed-by-human": true }, "imagefilterscropped_msaa16.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 12640089095135714872 + 17913962461417001295 ] ], - "bugs": [ - 2325 - ], - "reviewed-by-human": false + "reviewed-by-human": true }, "imagefilterscropped_nvprmsaa4.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 10202019670274831016 + 2214074105283093581 ] ], "reviewed-by-human": true @@ -13795,7 +13791,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 25990893730353865 + 1188078468842090523 ] ], "reviewed-by-human": true diff --git 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 index 9e163bc478..30a2868fb1 100644 --- 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 @@ -13749,47 +13749,43 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 11640669486244643201 + 16542120625365055907 ] - ] + ], + "reviewed-by-human": true }, "imagefilterscropped_8888.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 12644236474180508699 + 16506604652894367079 ] - ] + ], + "reviewed-by-human": true }, "imagefilterscropped_gpu.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 5203354974493284242 + 3296718973590080726 ] ], - "bugs": [ - 2325 - ], - "reviewed-by-human": false + "reviewed-by-human": true }, "imagefilterscropped_msaa16.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 12640089095135714872 + 17913962461417001295 ] ], - "bugs": [ - 2325 - ], - "reviewed-by-human": false + "reviewed-by-human": true }, "imagefilterscropped_nvprmsaa4.png": { "allowed-digests": [ [ "bitmap-64bitMD5", - 10202019670274831016 + 2214074105283093581 ] ], "reviewed-by-human": true @@ -13798,7 +13794,7 @@ "allowed-digests": [ [ "bitmap-64bitMD5", - 25990893730353865 + 1188078468842090523 ] ], "reviewed-by-human": true