* Removed bitmapshaders from expectations/gm/ignored-tests.txt.
* Rebaseline bitmapshaders, gpu didn't produce the same images when using only alpha bitmaps
because it didn't consider the skpaint's color.
BUG=skia:2293
R=jvanverth@google.com
Author: dandov@google.com
Review URL: https://codereview.chromium.org/339923004
diff --git a/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Debug/expected-results.json
index cdb1ae3..fbf1e1e 100644
--- a/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Debug/expected-results.json
@@ -868,28 +868,37 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5197903277365321489
+ 4292341330653523437
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapshaders_msaa16.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 11326079456423410536
+ 10394624353240372473
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapshaders_nvprmsaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 1701339364161004751
+ 3936439496049488534
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapsource_565.png": {
"allowed-digests": [
diff --git a/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Release/expected-results.json
index cdb1ae3..fbf1e1e 100644
--- a/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Logan-Nvidia-Arm7-Release/expected-results.json
@@ -868,28 +868,37 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5197903277365321489
+ 4292341330653523437
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapshaders_msaa16.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 11326079456423410536
+ 10394624353240372473
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapshaders_nvprmsaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 1701339364161004751
+ 3936439496049488534
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapsource_565.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 ae48fd8..284cafa 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
@@ -763,19 +763,25 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 10650014026870683913
+ 11942752365219497015
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapshaders_msaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 12053054119914570655
+ 8391486305693314097
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapsource_565.png": {
"allowed-digests": [
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 c32b053..c38324e 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
@@ -763,19 +763,25 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 10650014026870683913
+ 11942752365219497015
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapshaders_msaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 12053054119914570655
+ 8391486305693314097
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapsource_565.png": {
"allowed-digests": [
diff --git a/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json
index 9a2f169..43380b2 100644
--- a/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json
@@ -635,9 +635,12 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 1071839767047107920
+ 12179263968956328984
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapsource_565.png": {
diff --git a/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
index a5702a4..f0db8fd 100644
--- a/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
@@ -635,9 +635,12 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 1071839767047107920
+ 12179263968956328984
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapsource_565.png": {
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 7946ee0..8b156c5 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
@@ -585,9 +585,12 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 16703280953816628958
+ 1059519367608591882
]
],
+ "bugs": [
+ 2293
+ ],
"ignore-failure": true,
"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 5ff1e86..8207a91 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
@@ -585,9 +585,12 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 16703280953816628958
+ 1059519367608591882
]
],
+ "bugs": [
+ 2293
+ ],
"ignore-failure": true,
"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 611749c..a1946d0 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
@@ -615,9 +615,12 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 16703280953816628958
+ 1059519367608591882
]
],
+ "bugs": [
+ 2293
+ ],
"ignore-failure": true,
"reviewed-by-human": true
},
diff --git a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
index 6fb9036..e3e9287 100644
--- a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
@@ -615,9 +615,12 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 16703280953816628958
+ 1059519367608591882
]
],
+ "bugs": [
+ 2293
+ ],
"ignore-failure": true,
"reviewed-by-human": true
},
diff --git 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
index 6ecfc13..ce89d3b 100644
--- 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
@@ -1171,10 +1171,13 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5197903277365321489
+ 4292341330653523437
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapshaders_pdf-mac.png": {
"allowed-digests": [
diff --git 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
index 7504b9c..2c5ab32 100644
--- 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
@@ -1075,10 +1075,13 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5197903277365321489
+ 4292341330653523437
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapshaders_pdf-mac.png": {
"allowed-digests": [
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 87ee669..2d9c9d7 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
@@ -1171,10 +1171,13 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5197903277365321489
+ 4292341330653523437
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapshaders_pdf-mac.png": {
"allowed-digests": [
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 e315351..43fc4d9 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
@@ -991,10 +991,13 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5197903277365321489
+ 4292341330653523437
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapshaders_pdf-mac.png": {
"allowed-digests": [
diff --git 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
index eb9ac6c..bb77a48 100644
--- 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
@@ -1204,10 +1204,13 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5197903277365321489
+ 4292341330653523437
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapshaders_pdf-mac.png": {
"allowed-digests": [
diff --git 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
index 3e4e388..94568e4 100644
--- 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
@@ -1144,10 +1144,13 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5197903277365321489
+ 4292341330653523437
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapshaders_pdf-mac.png": {
"allowed-digests": [
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 89bb087..0cb1e46 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
@@ -1204,10 +1204,13 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5197903277365321489
+ 4292341330653523437
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapshaders_pdf-mac.png": {
"allowed-digests": [
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 71c2e3b..bd938ab 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
@@ -1036,10 +1036,13 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5197903277365321489
+ 4292341330653523437
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapshaders_pdf-mac.png": {
"allowed-digests": [
diff --git 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
index 2061802..a676127 100644
--- 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
@@ -1141,10 +1141,13 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5197903277365321489
+ 4292341330653523437
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapshaders_pdf-mac.png": {
"allowed-digests": [
diff --git 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
index 1ee65a2..ffc2584 100644
--- 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
@@ -1069,10 +1069,13 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5197903277365321489
+ 4292341330653523437
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapshaders_pdf-mac.png": {
"allowed-digests": [
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 c29a5f6..c0dd299 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
@@ -1141,10 +1141,13 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5197903277365321489
+ 4292341330653523437
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapshaders_pdf-mac.png": {
"allowed-digests": [
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 a8fc944..6481c80 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
@@ -1144,10 +1144,13 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5197903277365321489
+ 4292341330653523437
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapshaders_pdf-mac.png": {
"allowed-digests": [
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 ca19ed4..53a8e4e 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
@@ -1348,37 +1348,37 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5197903277365321489
+ 4292341330653523437
]
],
"bugs": [
- 2325
+ 2293
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"bitmapshaders_msaa16.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 11326079456423410536
+ 10394624353240372473
]
],
"bugs": [
- 2325
+ 2293
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"bitmapshaders_nvprmsaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 1701339364161004751
+ 3936439496049488534
]
],
"bugs": [
- 2325
+ 2293
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"bitmapshaders_pdf-poppler.png": {
"allowed-digests": [
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 026067f..a2a4381 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
@@ -1354,37 +1354,37 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5197903277365321489
+ 4292341330653523437
]
],
"bugs": [
- 2325
+ 2293
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"bitmapshaders_msaa16.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 11326079456423410536
+ 10394624353240372473
]
],
"bugs": [
- 2325
+ 2293
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"bitmapshaders_nvprmsaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 1701339364161004751
+ 3936439496049488534
]
],
"bugs": [
- 2325
+ 2293
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"bitmapshaders_pdf-poppler.png": {
"allowed-digests": [
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 6558b2e..629bf4f 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
@@ -1418,37 +1418,37 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5197903277365321489
+ 4292341330653523437
]
],
"bugs": [
- 2325
+ 2293
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"bitmapshaders_msaa16.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 11326079456423410536
+ 10394624353240372473
]
],
"bugs": [
- 2325
+ 2293
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"bitmapshaders_nvprmsaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 1701339364161004751
+ 3936439496049488534
]
],
"bugs": [
- 2325
+ 2293
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"bitmapshaders_pdf-poppler.png": {
"allowed-digests": [
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 5ed2049..c428eaa 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
@@ -1418,37 +1418,37 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5197903277365321489
+ 4292341330653523437
]
],
"bugs": [
- 2325
+ 2293
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"bitmapshaders_msaa16.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 11326079456423410536
+ 10394624353240372473
]
],
"bugs": [
- 2325
+ 2293
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"bitmapshaders_nvprmsaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 1701339364161004751
+ 3936439496049488534
]
],
"bugs": [
- 2325
+ 2293
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"bitmapshaders_pdf-poppler.png": {
"allowed-digests": [
diff --git 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
index 9fc1aa8..104d7c1 100644
--- 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
@@ -1162,10 +1162,13 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 4175176360478310748
+ 17577339008521169389
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapsource_565.png": {
"allowed-digests": [
diff --git 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
index a3902fb..012087d 100644
--- 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
@@ -882,28 +882,37 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 13161284638930508953
+ 787402053855503258
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapshaders_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 4834709600562535379
+ 13897226711214500859
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapshaders_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 1952697061591328574
+ 14493644938506788674
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapshaders_pdf-poppler.png": {
"allowed-digests": [
diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
index 5444ac4..59c7f93 100644
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
@@ -882,28 +882,37 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 13161284638930508953
+ 787402053855503258
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapshaders_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 4834709600562535379
+ 13897226711214500859
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapshaders_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 1952697061591328574
+ 14493644938506788674
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapshaders_pdf-poppler.png": {
"allowed-digests": [
diff --git 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
index 3b62176..0ff350c 100644
--- 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
@@ -1162,10 +1162,13 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 4175176360478310748
+ 17577339008521169389
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapsource_565.png": {
"allowed-digests": [
diff --git 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
index 4f2cf09..c1ae474 100644
--- 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
@@ -882,28 +882,37 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 13161284638930508953
+ 787402053855503258
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapshaders_8888.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 4834709600562535379
+ 13897226711214500859
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapshaders_gpu.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 1952697061591328574
+ 14493644938506788674
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapshaders_pdf-poppler.png": {
"allowed-digests": [
diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
index 956d115..8ae378b 100644
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
@@ -940,9 +940,12 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 10069875845044424404
+ 12926889331802186480
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapshaders_pdf-poppler.png": {
diff --git 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
index 0177a37..121dca0 100644
--- 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
@@ -900,10 +900,13 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 1952697061591328574
+ 14493644938506788674
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapshaders_pdf-poppler.png": {
"allowed-digests": [
diff --git 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
index 89c3117..7b62923 100644
--- 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
@@ -900,10 +900,13 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 1952697061591328574
+ 14493644938506788674
]
],
- "reviewed-by-human": false
+ "bugs": [
+ 2293
+ ],
+ "reviewed-by-human": true
},
"bitmapshaders_pdf-poppler.png": {
"allowed-digests": [
diff --git a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json
index 0903f79..b0b20f5 100644
--- a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json
@@ -1408,27 +1408,36 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5197903277365321489
+ 4292341330653523437
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapshaders_msaa16.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 11326079456423410536
+ 10394624353240372473
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapshaders_nvprmsaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 1701339364161004751
+ 3936439496049488534
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapshaders_pdf-poppler.png": {
diff --git a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json
index 63090c7..6c46b82 100644
--- a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json
@@ -1408,27 +1408,36 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5197903277365321489
+ 4292341330653523437
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapshaders_msaa16.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 11326079456423410536
+ 10394624353240372473
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapshaders_nvprmsaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 1701339364161004751
+ 3936439496049488534
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapshaders_pdf-poppler.png": {
diff --git 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
index 63a75d2..46bc413 100644
--- 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
@@ -1408,27 +1408,36 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5197903277365321489
+ 4292341330653523437
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapshaders_msaa16.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 11326079456423410536
+ 10394624353240372473
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapshaders_nvprmsaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 1701339364161004751
+ 3936439496049488534
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapshaders_pdf-poppler.png": {
diff --git 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
index c8f4ac0..a0aa111 100644
--- 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
@@ -1408,27 +1408,36 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5197903277365321489
+ 4292341330653523437
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapshaders_msaa16.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 11326079456423410536
+ 10394624353240372473
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapshaders_nvprmsaa4.png": {
"allowed-digests": [
[
"bitmap-64bitMD5",
- 1701339364161004751
+ 3936439496049488534
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapshaders_pdf-poppler.png": {
diff --git a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Debug/expected-results.json b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Debug/expected-results.json
index e416d30..64156db 100644
--- a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Debug/expected-results.json
@@ -946,9 +946,12 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 6776158511377132598
+ 3751006211682204833
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapshaders_pdf-poppler.png": {
diff --git a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Release/expected-results.json b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Release/expected-results.json
index 3e2fbe8..557b7f9 100644
--- a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Release/expected-results.json
@@ -946,9 +946,12 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 6776158511377132598
+ 3751006211682204833
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapshaders_pdf-poppler.png": {
diff --git 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
index dfba9d3..d5276a5 100644
--- 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
@@ -946,9 +946,12 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 6776158511377132598
+ 3751006211682204833
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapshaders_pdf-poppler.png": {
diff --git 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
index dfba9d3..d5276a5 100644
--- 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
@@ -946,9 +946,12 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 6776158511377132598
+ 3751006211682204833
]
],
+ "bugs": [
+ 2293
+ ],
"reviewed-by-human": true
},
"bitmapshaders_pdf-poppler.png": {
diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt
index 88b2bc0..50883c4 100644
--- a/expectations/gm/ignored-tests.txt
+++ b/expectations/gm/ignored-tests.txt
@@ -53,6 +53,3 @@
dashing4
dashcubics
-# dandov: Fix for bitmap shader by taking into account if the bitmap is alpha only
-# https://codereview.chromium.org/318923005/
-bitmapshaders