More rebases from conic change

TBR=
NOTRY=True
NOTREECHECKS=True
BUG=skia:

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

1 files changed, 52 insertions, 94 deletions

diff --git a/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json b/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json
index 3d7c402cf2..f2d6c4a042 100644
--- a/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json
@@ -343,25 +343,19 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18028564147828277613
+          536761209413392223
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "bitmaprect_i_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14065905418589114539
+          12062276997935598568
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "bitmaprect_rounding_565.png": {
       "allowed-digests": [
@@ -385,25 +379,19 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18028564147828277613
+          536761209413392223
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "bitmaprect_s_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14065905418589114539
+          12062276997935598568
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "bitmaprecttest_565.png": {
       "allowed-digests": [
@@ -539,19 +527,19 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8149334815780864538
+          15872669595593138064
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "blurcircles_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11187657384039514790
+          5899435941655220991
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "blurquickreject_565.png": {
       "allowed-digests": [
@@ -1562,31 +1550,25 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15142121429986244300
+          1512929701674393781
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "blurs_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2678056387405626667
+          10134637095796646275
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "c_gms_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10107093003176242727
+          5828041285054259894
         ]
       ], 
       "reviewed-by-human": true
@@ -1595,7 +1577,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17950578108756670940
+          17948236134584802588
         ]
       ], 
       "reviewed-by-human": true
@@ -1694,7 +1676,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12774269801510789624
+          8152904404660947682
         ]
       ], 
       "reviewed-by-human": true
@@ -1703,7 +1685,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1715855085118931140
+          8877023123311432869
         ]
       ], 
       "reviewed-by-human": true
@@ -1712,25 +1694,19 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7045926575348655010
+          15024362390271487073
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "circular-clips_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7045926575348655010
+          15024362390271487073
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "clamped_gradients_565.png": {
       "allowed-digests": [
@@ -2234,7 +2210,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10994368893427329769
+          1675782474943520460
         ]
       ], 
       "reviewed-by-human": true
@@ -2243,7 +2219,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15424935115485364412
+          6967904968241065468
         ]
       ], 
       "reviewed-by-human": true
@@ -2252,7 +2228,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7526586064950458315
+          15480961698862666754
         ]
       ], 
       "reviewed-by-human": true
@@ -2261,7 +2237,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7990611683632495300
+          5084826939490771639
         ]
       ], 
       "reviewed-by-human": true
@@ -2468,7 +2444,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3326756300818791255
+          9437982002609046613
         ]
       ], 
       "reviewed-by-human": true
@@ -2477,7 +2453,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11503434061632527023
+          5107091255796979515
         ]
       ], 
       "reviewed-by-human": true
@@ -2576,25 +2552,19 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7522047842497784488
+          15935717240228323960
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "dashing2_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16976334130763507258
+          313322311006398970
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "dashing3_565.png": {
       "allowed-digests": [
@@ -3140,7 +3110,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7282537335075785928
+          7681289742249109737
         ]
       ], 
       "reviewed-by-human": true
@@ -3149,7 +3119,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8863849031372460120
+          16377115640415455774
         ]
       ], 
       "reviewed-by-human": true
@@ -3158,7 +3128,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8642787233756750706
+          3118152546151315571
         ]
       ], 
       "reviewed-by-human": true
@@ -3167,7 +3137,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3438144398085081829
+          2019483616844304565
         ]
       ], 
       "reviewed-by-human": true
@@ -3284,7 +3254,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11559795738519917215
+          894010738745748016
         ]
       ], 
       "reviewed-by-human": true
@@ -3293,7 +3263,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11559795738519917215
+          894010738745748016
         ]
       ], 
       "reviewed-by-human": true
@@ -3326,55 +3296,43 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7781767658511133788
+          14268548677040849696
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "fatpathfill_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15926472232550846517
+          5895228941510947093
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "filltypes_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6394623980536394421
+          18136397034817900979
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "filltypes_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4586322702989781686
+          8912060045544766918
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "filltypespersp_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          777617692643742677
+          5234941170738475581
         ]
       ], 
       "reviewed-by-human": true
@@ -3383,7 +3341,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10102869494909703223
+          1579804672408847994
         ]
       ], 
       "reviewed-by-human": true
@@ -4535,7 +4493,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7705602392286232569
+          12157225206433982550
         ]
       ], 
       "reviewed-by-human": true
@@ -4544,7 +4502,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7917647863623017495
+          2869671884946577859
         ]
       ], 
       "reviewed-by-human": true