rebase
TBR=
NOTRY=True
BUG=skia:
Review URL: https://codereview.chromium.org/818163002
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 cdc5799..722363f 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
@@ -632,7 +632,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 11804559176829808079
+ 12629194803277348198
]
],
"reviewed-by-human": true
@@ -5947,7 +5947,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 7992861083359848839
+ 11039455854405254523
]
],
"reviewed-by-human": true
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 8d56957..e4ffa3f 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
@@ -5939,7 +5939,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 5956724422129694681
+ 5503805132653538178
]
],
"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 19d1151..d605ecd 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
@@ -3170,7 +3170,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 7767738330484383574
+ 15150732943798208430
]
],
"reviewed-by-human": true
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 0e79cbb..fa6c6bd 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
@@ -1108,13 +1108,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 11716878894136852163
+ 7253014114831803761
]
],
- "bugs": [
- 2146
- ],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"blurquickreject_pdf-poppler.png": {
"allowed-digests": [
@@ -3761,7 +3758,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 15337469482293110664
+ 16057186372196913200
]
],
"reviewed-by-human": true
@@ -3828,7 +3825,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 6583646744917947707
+ 552096056301855262
]
],
"reviewed-by-human": true
@@ -3959,7 +3956,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 132339536672134632
+ 18340453638566291417
]
],
"reviewed-by-human": true
@@ -4079,7 +4076,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 18019424336401473068
+ 12244191712053403163
]
],
"reviewed-by-human": true
@@ -4157,7 +4154,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 4338950754732692569
+ 7060998906685292099
]
],
"reviewed-by-human": true
@@ -6703,7 +6700,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 14985956118720057158
+ 13123782571095825635
]
],
"reviewed-by-human": true
@@ -8149,10 +8146,10 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 13075334119681728587
+ 7325931426443685800
]
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"gradients_many_pdf-poppler.png": {
"allowed-digests": [
@@ -12918,7 +12915,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 13200720268163786959
+ 12428344101707230866
]
],
"reviewed-by-human": true
@@ -13767,7 +13764,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 328040482666815744
+ 4543644551335204638
]
],
"reviewed-by-human": true
@@ -13806,7 +13803,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 11943297704727608179
+ 11164876489073081005
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt
index fe87f05..6574096 100644
--- a/expectations/gm/ignored-tests.txt
+++ b/expectations/gm/ignored-tests.txt
@@ -33,9 +33,6 @@
## epoger will rebaseline by 25 Dec 2013
#gradtext
-#joshualitt
-gpusamplerstress
-
# robertphillips - skia:2995
blurrects