diff options
author | joshualitt <joshualitt@chromium.org> | 2014-12-22 17:29:33 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-12-22 17:29:33 -0800 |
commit | f3c770b16025900e5185e1db2bafb58de7120b83 (patch) | |
tree | c5b16b80ba7017b4c297ca636e2b107d24d85dd1 | |
parent | 0acf1b4b3645772d220c720313821bac389751b5 (diff) |
rebase
TBR=
NOTRY=True
BUG=skia:
Review URL: https://codereview.chromium.org/818163002
5 files changed, 17 insertions, 23 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 cdc5799e65..722363f679 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 8d56957fd4..e4ffa3f94a 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 19d115156a..d605ecde42 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 0e79cbb821..fa6c6bd106 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 fe87f05c12..6574096214 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 |