rebase
TBR=
BUG=skia:
Review URL: https://codereview.chromium.org/822483003
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 917cfe2..e3bd13d 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
@@ -2768,7 +2768,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 13851191489018651330
+ 16992170134987036005
]
],
"ignore-failure": false,
@@ -8857,7 +8857,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 569651473671180319
+ 16638350607246542679
]
],
"ignore-failure": false,
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 8652ca0..b62d1e5 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
@@ -4486,7 +4486,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 17921560769044507677
+ 10510933598467501075
]
],
"reviewed-by-human": true
@@ -14935,7 +14935,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 12354830415763490646
+ 9432972599855575471
]
],
"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 9d9cc7a..ffecb74 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
@@ -4005,7 +4005,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 17921560769044507677
+ 10510933598467501075
]
],
"reviewed-by-human": true
@@ -12538,7 +12538,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 12354830415763490646
+ 9432972599855575471
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-NexusPlayer-PowerVR-x86-Debug/expected-results.json b/expectations/gm/Test-Android-NexusPlayer-PowerVR-x86-Debug/expected-results.json
index 30e1606..843ce72 100644
--- a/expectations/gm/Test-Android-NexusPlayer-PowerVR-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-NexusPlayer-PowerVR-x86-Debug/expected-results.json
@@ -3796,7 +3796,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 7596565938029816605
+ 7354435865567754057
]
],
"reviewed-by-human": true
@@ -11504,7 +11504,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 9165494704818317306
+ 13170026150976651845
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-NexusPlayer-PowerVR-x86-Release/expected-results.json b/expectations/gm/Test-Android-NexusPlayer-PowerVR-x86-Release/expected-results.json
index e5a350c..7306e09 100644
--- a/expectations/gm/Test-Android-NexusPlayer-PowerVR-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Android-NexusPlayer-PowerVR-x86-Release/expected-results.json
@@ -3832,7 +3832,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 7596565938029816605
+ 7354435865567754057
]
],
"reviewed-by-human": true
@@ -11528,7 +11528,7 @@
"allowed-digests": [
[
"bitmap-64bitMD5",
- 9165494704818317306
+ 13170026150976651845
]
],
"reviewed-by-human": true
diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt
index 9b35ba4..759d398 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
-dashing3
-
# robertphillips - skia:2995
blurrects