rebase

TBR=
BUG=skia:

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

20 files changed, 34 insertions, 42 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 961b446fda..29c4672685 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
@@ -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 84037032d0..a955d8fb09 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
@@ -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 75d90f7458..53c34338a1 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
@@ -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 b8996f9fc6..ed651ab5cc 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
@@ -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 a25fc85563..76aa0cc7b9 100644
--- 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 a25fc85563..76aa0cc7b9 100644
--- 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 07d0a81472..54ca9d53df 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
@@ -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 07d0a81472..54ca9d53df 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
@@ -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 724cad9ac6..34a0856def 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
@@ -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 19205ec58a..0e0f6de513 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
@@ -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 a596c4e423..4053208716 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
@@ -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 7539b1b561..59ba6ff747 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
@@ -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 3b5d6c5244..c8c76b57ef 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
@@ -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 e3469791ef..c97af07df8 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
@@ -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 2c710094b4..72afbcbe82 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
@@ -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 afea7ffea6..6e590c1673 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
@@ -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 77aee305b5..c58ee2c329 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
@@ -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 d49087f382..fe98cce31b 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
@@ -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 ebd75e5607..29f7cde94c 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
@@ -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 6a2587d10d..68db6961f8 100644
--- 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