More rebases from conic change

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

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

1 files changed, 95 insertions, 158 deletions

diff --git a/expectations/gm/Test-Mac10.9-MacMini6.2-HD4000-x86_64-Debug/expected-results.json b/expectations/gm/Test-Mac10.9-MacMini6.2-HD4000-x86_64-Debug/expected-results.json
index da084340c7..2b8f2bdcb5 100644
--- a/expectations/gm/Test-Mac10.9-MacMini6.2-HD4000-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.9-MacMini6.2-HD4000-x86_64-Debug/expected-results.json
@@ -614,13 +614,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4641909743187743108
+          13779591857163213996
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "bigmatrix_pdf-poppler.png": {
       "allowed-digests": [
@@ -851,31 +848,25 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15954400542104295064
+          9305339748506393079
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "bitmaprect_i_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1263164671174760260
+          3135711085515917033
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "bitmaprect_i_gpu.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4436194354875050625
+          9555725111265940497
         ]
       ], 
       "reviewed-by-human": true
@@ -884,7 +875,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9773926833639563225
+          13610235749048647278
         ]
       ], 
       "ignore-failure": false, 
@@ -942,31 +933,25 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15954400542104295064
+          9305339748506393079
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "bitmaprect_s_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1263164671174760260
+          3135711085515917033
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "bitmaprect_s_gpu.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4436194354875050625
+          9555725111265940497
         ]
       ], 
       "reviewed-by-human": true
@@ -975,7 +960,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9773926833639563225
+          13610235749048647278
         ]
       ], 
       "ignore-failure": false, 
@@ -1097,7 +1082,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2680932433335095501
+          13223525822230084282
         ]
       ], 
       "reviewed-by-human": true
@@ -1106,7 +1091,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12545208314049596230
+          4642377811404465855
         ]
       ], 
       "reviewed-by-human": true
@@ -1115,7 +1100,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3751006211682204833
+          4183733036772978932
         ]
       ], 
       "reviewed-by-human": true
@@ -1124,10 +1109,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          707206315357179358
+          16397881115864571268
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "bitmapsource_565.png": {
       "allowed-digests": [
@@ -1287,25 +1272,25 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          446330175668077197
+          3910245249732672702
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "blurcircles_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6067714883605508534
+          4573916906125337247
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "blurcircles_gpu.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12127194556687868225
+          13210145312533872574
         ]
       ], 
       "reviewed-by-human": true
@@ -1314,10 +1299,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12252850856266741999
+          4380271719715132133
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "blurquickreject_565.png": {
       "allowed-digests": [
@@ -3819,7 +3804,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12382588963025472573
+          6048139949354057257
         ]
       ], 
       "reviewed-by-human": true
@@ -3828,7 +3813,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11954715925919403478
+          3126437106507271197
         ]
       ], 
       "reviewed-by-human": true
@@ -3846,7 +3831,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8801344868326383298
+          2572751194137789510
         ]
       ], 
       "reviewed-by-human": true
@@ -3867,7 +3852,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5542428229824779255
+          16990081004985113814
         ]
       ], 
       "reviewed-by-human": true
@@ -3876,7 +3861,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16280569963661652134
+          17167644474034418102
         ]
       ], 
       "reviewed-by-human": true
@@ -3885,7 +3870,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7576296421535394744
+          17422622515651725120
         ]
       ], 
       "reviewed-by-human": true
@@ -3894,7 +3879,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6723721717118023218
+          2366150227345731848
         ]
       ], 
       "reviewed-by-human": true
@@ -4110,7 +4095,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1400995565388562154
+          13400987250919776457
         ]
       ], 
       "reviewed-by-human": true
@@ -4119,7 +4104,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6024811588476039919
+          3265478507978170148
         ]
       ], 
       "reviewed-by-human": true
@@ -4128,7 +4113,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4058697882727803575
+          2279973446636518638
         ]
       ], 
       "reviewed-by-human": true
@@ -4137,7 +4122,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1284501510740653249
+          17813894686588739549
         ]
       ], 
       "reviewed-by-human": true
@@ -4158,49 +4143,37 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5152108745492225309
+          1268178903375931116
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "circular-clips_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5152108745492225309
+          1268178903375931116
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "circular-clips_gpu.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1988347527319338472
+          5218902741020534200
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "circular-clips_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5152108745492225309
+          1268178903375931116
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "circular-clips_pdf-poppler.png": {
       "allowed-digests": [
@@ -5407,7 +5380,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5468977961187214704
+          2334211672821072931
         ]
       ], 
       "reviewed-by-human": true
@@ -5416,7 +5389,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2403832751999064083
+          9803495439058028665
         ]
       ], 
       "reviewed-by-human": true
@@ -5443,7 +5416,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8388055320375291987
+          6940133113491646626
         ]
       ], 
       "reviewed-by-human": true
@@ -5452,7 +5425,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11458581276140201220
+          10666236282020487592
         ]
       ], 
       "reviewed-by-human": true
@@ -5909,7 +5882,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12551356586840117340
+          17338201399951359010
         ]
       ], 
       "reviewed-by-human": true
@@ -5918,7 +5891,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2176494379518756249
+          11685665101626968196
         ]
       ], 
       "reviewed-by-human": true
@@ -5927,7 +5900,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16902051463811933570
+          18333855624963024537
         ]
       ], 
       "reviewed-by-human": true
@@ -5936,7 +5909,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18358845165811074430
+          8351522497537417380
         ]
       ], 
       "reviewed-by-human": true
@@ -6167,49 +6140,37 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2494610485041198535
+          4255976439368108241
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "dashing2_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5568370216546802477
+          5133270592723595747
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "dashing2_gpu.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          491154211623518706
+          5133270592723595747
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "dashing2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17593982973090754988
+          575903905577729859
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "dashing2_pdf-poppler.png": {
       "allowed-digests": [
@@ -7578,7 +7539,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3740162382031499255
+          3835936574267479626
         ]
       ], 
       "reviewed-by-human": true
@@ -7587,7 +7548,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7505650564332324157
+          17089969344519564549
         ]
       ], 
       "reviewed-by-human": true
@@ -7596,7 +7557,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12133615140953611571
+          14451268947950338096
         ]
       ], 
       "reviewed-by-human": true
@@ -7605,7 +7566,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2385117835721460251
+          16894605727816679998
         ]
       ], 
       "reviewed-by-human": true
@@ -7614,7 +7575,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11734805616328532473
+          9742563201363327342
         ]
       ], 
       "reviewed-by-human": true
@@ -7623,7 +7584,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15866313795539109198
+          17340135083829694116
         ]
       ], 
       "reviewed-by-human": true
@@ -7632,7 +7593,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2677768719405172427
+          9252493376798131229
         ]
       ], 
       "reviewed-by-human": true
@@ -7641,7 +7602,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6097704912754994472
+          2500209329481939718
         ]
       ], 
       "reviewed-by-human": true
@@ -7878,7 +7839,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10931473040653078858
+          15147526419549013440
         ]
       ], 
       "reviewed-by-human": true
@@ -7887,7 +7848,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10931473040653078858
+          15147526419549013440
         ]
       ], 
       "reviewed-by-human": true
@@ -7896,7 +7857,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10931473040653078858
+          15147526419549013440
         ]
       ], 
       "reviewed-by-human": true
@@ -7905,13 +7866,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10931473040653078858
+          15147526419549013440
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "extractbitmap_pdf-poppler.png": {
       "allowed-digests": [
@@ -7989,25 +7947,19 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7781767658511133788
+          11666109622146844931
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "fatpathfill_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15926472232550846517
+          8396848796253014683
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "fatpathfill_gpu.png": {
       "allowed-digests": [
@@ -8022,13 +7974,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17219048439483287069
+          158275386763293804
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "fatpathfill_pdf-poppler.png": {
       "allowed-digests": [
@@ -8046,49 +7995,37 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1160039999451806268
+          329073036728491315
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "filltypes_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9755437692677243946
+          4765828216081544517
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "filltypes_gpu.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18124989730286911389
+          7442844217851883503
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "filltypes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4045881034711476968
+          11389731528495074191
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "filltypes_pdf-poppler.png": {
       "allowed-digests": [
@@ -8106,7 +8043,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1681793359301655602
+          321515100332745650
         ]
       ], 
       "reviewed-by-human": true
@@ -8115,7 +8052,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15582050601814514181
+          6491955936359235702
         ]
       ], 
       "reviewed-by-human": true
@@ -8124,7 +8061,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10433163578393614219
+          7393080047827490381
         ]
       ], 
       "reviewed-by-human": true
@@ -10249,7 +10186,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17908788965293723780
+          5694599777562728237
         ]
       ], 
       "reviewed-by-human": true
@@ -10844,7 +10781,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18122502157273537720
+          2400947053271707332
         ]
       ], 
       "reviewed-by-human": true
@@ -10853,7 +10790,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4408059671304210250
+          7484091695459891840
         ]
       ], 
       "reviewed-by-human": true
@@ -10862,7 +10799,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7474015756931818263
+          11688912835767518559
         ]
       ], 
       "reviewed-by-human": true