rebase

TBR=
BUG=skia:

Review URL: https://codereview.chromium.org/717033002

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 961b446fda70f887f871440a3e0c584866628d80..29c467268563f5daa5d28eb70ce0d20ac9bfde6f 100644 (file)
--- a/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Debug/expected-results.json
@@ -2722,11 +2722,11 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16628817470554933537
+          11260702539770515825
         ]
       ], 
       "ignore-failure": false, 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "complexclip2_rrect_aa_565.png": {
       "allowed-digests": [
@@ -2750,7 +2750,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12795866211978733736
+          8207603413123076437
         ]
       ], 
       "reviewed-by-human": true
@@ -2970,7 +2970,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11432946954654704028
+          1490078855479156780
         ]
       ], 
       "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 84037032d0e9f2a181558a38bae8714b1d1c58e5..a955d8fb099979958828eb331a5046355d0ce822 100644 (file)
--- a/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Release/expected-results.json
@@ -2722,11 +2722,11 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16628817470554933537
+          11260702539770515825
         ]
       ], 
       "ignore-failure": false, 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "complexclip2_rrect_aa_565.png": {
       "allowed-digests": [
@@ -2750,7 +2750,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12795866211978733736
+          8207603413123076437
         ]
       ], 
       "reviewed-by-human": true
@@ -2970,7 +2970,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11432946954654704028
+          1490078855479156780
         ]
       ], 
       "reviewed-by-human": true

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 75d90f74583570d8192cea1718afdb974e539d1b..53c34338a19cd0d6e57828e12a6eec6eb138eeed 100644 (file)
--- a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
@@ -4347,7 +4347,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1400000972609731233
+          8266086446395365519
         ]
       ], 
       "reviewed-by-human": true
@@ -4392,7 +4392,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12606971060652066622
+          9914909181123988337
         ]
       ], 
       "reviewed-by-human": true
@@ -4482,7 +4482,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14513438909331829416
+          8751550775171239934
         ]
       ], 
       "reviewed-by-human": true
@@ -4754,7 +4754,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6759807206859506757
+          12376997733881428625
         ]
       ], 
       "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 b8996f9fc6a2512bff4ea64a15c3ad204948e7f1..ed651ab5cc1c23ce9c3178d8bf286fd7ec68aa88 100644 (file)
--- a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
@@ -3726,7 +3726,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1400000972609731233
+          8266086446395365519
         ]
       ], 
       "reviewed-by-human": true
@@ -3762,7 +3762,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12606971060652066622
+          9914909181123988337
         ]
       ], 
       "reviewed-by-human": true
@@ -3834,7 +3834,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14513438909331829416
+          8751550775171239934
         ]
       ], 
       "reviewed-by-human": true
@@ -4052,7 +4052,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6759807206859506757
+          12376997733881428625
         ]
       ], 
       "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 a25fc85563c0812e0c8a9a4565e9afca5bf1e631..76aa0cc7b94671f5df1b6e0f3a801d7f4688ddf5 100644 (file)
--- a/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Debug/expected-results.json
@@ -2939,7 +2939,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3615138553335577401
+          4416553582248957532
         ]
       ], 
       "reviewed-by-human": true
@@ -2966,7 +2966,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9394585766845655876
+          5096670102008734689
         ]
       ], 
       "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 a25fc85563c0812e0c8a9a4565e9afca5bf1e631..76aa0cc7b94671f5df1b6e0f3a801d7f4688ddf5 100644 (file)
--- a/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Release/expected-results.json
@@ -2939,7 +2939,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3615138553335577401
+          4416553582248957532
         ]
       ], 
       "reviewed-by-human": true
@@ -2966,7 +2966,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9394585766845655876
+          5096670102008734689
         ]
       ], 
       "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 07d0a81472e11ed2e9c16ef900824a9baa4af2b5..54ca9d53dfd3fb1d026a44ed004380b62d0ffc23 100644 (file)
--- a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
@@ -2816,7 +2816,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4718446894897029439
+          17730452692901478104
         ]
       ], 
       "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 07d0a81472e11ed2e9c16ef900824a9baa4af2b5..54ca9d53dfd3fb1d026a44ed004380b62d0ffc23 100644 (file)
--- a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
@@ -2816,7 +2816,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4718446894897029439
+          17730452692901478104
         ]
       ], 
       "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 724cad9ac6eeca7bbfe6ae5166f0f3ec524a84a4..34a0856def7b0c4a4263aa5dc4d75fc22c68d6fa 100644 (file)
--- a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
@@ -2854,7 +2854,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3759156208776312664
+          16502270798870838505
         ]
       ], 
       "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 19205ec58aadb6b99dc6510cea4fd8221e08a3a1..0e0f6de5130c362b679e2265211f46dea0afad84 100644 (file)
--- a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
@@ -2854,7 +2854,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3759156208776312664
+          16502270798870838505
         ]
       ], 
       "reviewed-by-human": true

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 a596c4e4235ba27079978f7f9fffe1f72a08d6f7..40532087164f053b2914aa99a94ab5e1d0e1ee64 100644 (file)
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json
@@ -12389,7 +12389,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12702798999143893321
+          7333126522525012064
         ]
       ], 
       "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 7539b1b5617cccc87e33b4c65ca9d1581847041e..59ba6ff7477915fcce0b60978400454f1d3e6a69 100644 (file)
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json
@@ -12509,7 +12509,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12702798999143893321
+          7333126522525012064
         ]
       ], 
       "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 3b5d6c5244174d0013038731197eeecb83737a85..c8c76b57ef3ebec5fcd9d0e37a54e83f91e36e49 100644 (file)
--- 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
@@ -12491,7 +12491,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12702798999143893321
+          7333126522525012064
         ]
       ], 
       "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 e3469791eff731f72dab503f996c7500c3a0c2c9..c97af07df8a35b3f4f8d8f958684ee48a1f0e502 100644 (file)
--- 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
@@ -12494,7 +12494,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12702798999143893321
+          7333126522525012064
         ]
       ], 
       "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 2c710094b48e7da23a6d9c44b6cc1b35c0f917b7..72afbcbe8294ece1bb36afb23b3dfaebbb52b4ad 100644 (file)
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
@@ -13295,7 +13295,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13010564465906914434
+          12227615864212304634
         ]
       ], 
       "reviewed-by-human": true

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 afea7ffea62d6bb3e1dd4d8351a5732a97fd9ab9..6e590c1673c1cb892c98a572165c02b3238c394d 100644 (file)
--- a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json
@@ -12415,7 +12415,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12702798999143893321
+          7333126522525012064
         ]
       ], 
       "reviewed-by-human": true

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 77aee305b5d6b50d6808c6fdb62835e5ec1c466f..c58ee2c329de42bad00855734683e267f61b1da9 100644 (file)
--- a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json
@@ -12415,7 +12415,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12702798999143893321
+          7333126522525012064
         ]
       ], 
       "reviewed-by-human": true

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 d49087f3822eede5d9567d9dba0d135ac39e3b21..fe98cce31b5a10e3fafc9fe988b8a1107fd9b11c 100644 (file)
--- 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
@@ -12415,7 +12415,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12702798999143893321
+          7333126522525012064
         ]
       ], 
       "reviewed-by-human": true

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 ebd75e560769353825706a0196f1ed6313b199de..29f7cde94c55cb897ec249389c1463976a38b85b 100644 (file)
--- 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
@@ -6511,7 +6511,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14833041371169287873
+          17313899900380566045
         ]
       ], 
       "ignore-failure": true, 
@@ -12415,7 +12415,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12702798999143893321
+          7333126522525012064
         ]
       ], 
       "reviewed-by-human": true

diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt
index 6a2587d10d2585ca863d2c51d23148b63b4ef93a..68db6961f8cb5d41859ccd998eb02facc2fd5655 100644 (file)
--- a/expectations/gm/ignored-tests.txt
+++ b/expectations/gm/ignored-tests.txt
@@ -48,13 +48,5 @@ dropshadowimagefilter
 # quality improvements to imagemagnifier GM
 imagemagnifier
 
-#joshualitt
-hairmodes
-complexclip_aa
-complexclip2_rect_aa
-complexclip2_rrect_aa
-convex_poly_clip
-verttext
-
 #reed
 modecolorfilters