rebase and remove ignores

NOTRY=True
TBR=
BUG=skia:

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

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 5b9bf03..762aea8 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
@@ -5884,7 +5884,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11631662733029985270
+          16763188151005986073
         ]
       ], 
       "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 e1ca044..7ca8063 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
@@ -623,7 +623,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16899358002575226375
+          5132137229717935821
         ]
       ], 
       "reviewed-by-human": true
@@ -5876,7 +5876,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6118892357057612191
+          13036186555414455125
         ]
       ], 
       "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 f5dcf91..e88a965 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
@@ -10456,7 +10456,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11895733522171344359
+          15496402527902048731
         ]
       ], 
       "reviewed-by-human": true
@@ -16509,7 +16509,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8116770864095691357
+          1602587625386148569
         ]
       ], 
       "reviewed-by-human": true
@@ -16554,7 +16554,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8116770864095691357
+          1602587625386148569
         ]
       ], 
       "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 b6d8134..92a8fd4 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
@@ -4105,7 +4105,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8281830294192301936
+          9799652110156767003
         ]
       ], 
       "reviewed-by-human": true
@@ -4177,7 +4177,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7820452161292263014
+          2723021135148480001
         ]
       ], 
       "reviewed-by-human": true

diff --git a/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Debug/expected-results.json b/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Debug/expected-results.json
index 7646965..a8b5bfb 100644 (file)
--- a/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Debug/expected-results.json
@@ -10140,7 +10140,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9634696801788021578
+          7838370347361830341
         ]
       ], 
       "ignore-failure": true, 

diff --git a/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Release/expected-results.json b/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Release/expected-results.json
index e72e6ef..019611b 100644 (file)
--- a/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Release/expected-results.json
@@ -10141,7 +10141,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13789871504501847025
+          4136906786941949595
         ]
       ], 
       "ignore-failure": true, 

diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
index 7b34abc..cbd5950 100644 (file)
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
@@ -8372,7 +8372,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14068005127069681159
+          13176082327995749679
         ]
       ], 
       "ignore-failure": true, 
@@ -14226,4 +14226,4 @@
       "reviewed-by-human": true
     }
   }
-}
+}
\ No newline at end of file

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 276dd6e..978eff4 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
@@ -8245,7 +8245,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9966730557110500201
+          1937214114506389369
         ]
       ], 
       "ignore-failure": true, 
@@ -13962,4 +13962,4 @@
       "reviewed-by-human": true
     }
   }
-}
+}
\ No newline at end of file

diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json
index c24c6c8..85ad7cc 100644 (file)
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json
@@ -8401,7 +8401,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1682013033344086714
+          3685552483059847395
         ]
       ], 
       "ignore-failure": true, 
@@ -14264,4 +14264,4 @@
       "reviewed-by-human": true
     }
   }
-}
+}
\ No newline at end of file

diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json
index 2618b06..82497ed 100644 (file)
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json
@@ -14264,4 +14264,4 @@
       "reviewed-by-human": true
     }
   }
-}
+}
\ No newline at end of file

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 d56a3e8..b06535b 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
@@ -15014,7 +15014,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9769883945866659220
+          7455993603061352328
         ]
       ], 
       "reviewed-by-human": true

diff --git a/expectations/gm/ignored-tests.txt b/expectations/gm/ignored-tests.txt
index bf71e72..6930bbd 100644 (file)
--- a/expectations/gm/ignored-tests.txt
+++ b/expectations/gm/ignored-tests.txt
@@ -67,10 +67,3 @@ drawbitmapmatrix
 
 #junov skbug.com/3176
 pictureimagefilter
-
-#joshualitt
-hairlines
-patch_primitive
-xfermodes3
-multipicturedraw_sierpinski_tiled
-multipicturedraw_sierpinski_simple