More rebases from conic change

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

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

1 files changed, 101 insertions, 101 deletions

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 d872d4f85d..aa20300281 100644
--- a/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Debug/expected-results.json
@@ -517,7 +517,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8704820462791580200
+          4856043985990031640
         ]
       ], 
       "reviewed-by-human": true
@@ -526,10 +526,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6873835910636963460
+          5639736895173274853
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "bigtext_565.png": {
       "allowed-digests": [
@@ -670,7 +670,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18028564147828277613
+          536761209413392223
         ]
       ], 
       "reviewed-by-human": true
@@ -679,7 +679,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14065905418589114539
+          12062276997935598568
         ]
       ], 
       "reviewed-by-human": true
@@ -688,7 +688,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8511579297892894623
+          7947462177272384154
         ]
       ], 
       "reviewed-by-human": true
@@ -697,7 +697,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7851232271117128980
+          9355621473441399631
         ]
       ], 
       "reviewed-by-human": true
@@ -706,7 +706,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1399188605698989457
+          5139317929187958346
         ]
       ], 
       "reviewed-by-human": true
@@ -760,7 +760,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18028564147828277613
+          536761209413392223
         ]
       ], 
       "reviewed-by-human": true
@@ -769,7 +769,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14065905418589114539
+          12062276997935598568
         ]
       ], 
       "reviewed-by-human": true
@@ -778,7 +778,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8511579297892894623
+          7947462177272384154
         ]
       ], 
       "reviewed-by-human": true
@@ -787,7 +787,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7851232271117128980
+          9355621473441399631
         ]
       ], 
       "reviewed-by-human": true
@@ -796,7 +796,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1399188605698989457
+          5139317929187958346
         ]
       ], 
       "reviewed-by-human": true
@@ -931,10 +931,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16768122979300405928
+          16143767482637940671
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "bitmapsource_565.png": {
       "allowed-digests": [
@@ -1120,7 +1120,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11627389852748930348
+          12472131168469712626
         ]
       ], 
       "reviewed-by-human": true
@@ -1129,7 +1129,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11187657384039514790
+          5899435941655220991
         ]
       ], 
       "reviewed-by-human": true
@@ -1138,7 +1138,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6125325568353237512
+          1290156650264632402
         ]
       ], 
       "reviewed-by-human": true
@@ -1147,7 +1147,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15077952026473594665
+          17515300128432044962
         ]
       ], 
       "reviewed-by-human": true
@@ -1156,7 +1156,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7277028211493676521
+          9924645166775861055
         ]
       ], 
       "reviewed-by-human": true
@@ -1327,7 +1327,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6850711322357366834
+          9224835952542586513
         ]
       ], 
       "reviewed-by-human": true
@@ -1336,7 +1336,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3232455322012377817
+          16083791654239867224
         ]
       ], 
       "reviewed-by-human": true
@@ -1345,19 +1345,19 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16280549642825337575
+          4630702215932344199
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "blurs_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12952750947910530683
+          3128182951603077139
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "blurs_gpu.png": {
       "allowed-digests": [
@@ -1372,7 +1372,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13019625347870849585
+          5042682616974361444
         ]
       ], 
       "reviewed-by-human": true
@@ -1381,7 +1381,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8022102071788789190
+          9766896785069704325
         ]
       ], 
       "reviewed-by-human": true
@@ -1390,7 +1390,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10107093003176242727
+          5828041285054259894
         ]
       ], 
       "reviewed-by-human": true
@@ -1399,7 +1399,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17950578108756670940
+          17948236134584802588
         ]
       ], 
       "reviewed-by-human": true
@@ -1408,7 +1408,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1195513669632768746
+          13687148022208930889
         ]
       ], 
       "reviewed-by-human": true
@@ -1417,7 +1417,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8200431032241355202
+          15015896142089563404
         ]
       ], 
       "reviewed-by-human": true
@@ -1426,7 +1426,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2305592619181750980
+          10113689249470436755
         ]
       ], 
       "reviewed-by-human": true
@@ -1525,7 +1525,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12774269801510789624
+          8152904404660947682
         ]
       ], 
       "reviewed-by-human": true
@@ -1534,7 +1534,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1715855085118931140
+          8877023123311432869
         ]
       ], 
       "reviewed-by-human": true
@@ -1543,7 +1543,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16647858389982943968
+          14113427915028166980
         ]
       ], 
       "reviewed-by-human": true
@@ -1552,7 +1552,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2703626695064887001
+          15740172568735804146
         ]
       ], 
       "reviewed-by-human": true
@@ -1561,7 +1561,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8842483097979349828
+          9689085183070724259
         ]
       ], 
       "reviewed-by-human": true
@@ -1570,7 +1570,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7045926575348655010
+          15024362390271487073
         ]
       ], 
       "reviewed-by-human": true
@@ -1579,7 +1579,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7045926575348655010
+          15024362390271487073
         ]
       ], 
       "reviewed-by-human": true
@@ -1588,7 +1588,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1988347527319338472
+          5218902741020534200
         ]
       ], 
       "reviewed-by-human": true
@@ -1597,7 +1597,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14908415861822233627
+          14018052354357531586
         ]
       ], 
       "reviewed-by-human": true
@@ -1606,7 +1606,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11145869224897143526
+          13499188702180661423
         ]
       ], 
       "reviewed-by-human": true
@@ -2488,7 +2488,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9086556612834083272
+          78631004271100469
         ]
       ], 
       "reviewed-by-human": true
@@ -2623,7 +2623,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3907562405831103901
+          864397771126046444
         ]
       ], 
       "reviewed-by-human": true
@@ -2641,7 +2641,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7339092889949838818
+          15050030411149622681
         ]
       ], 
       "reviewed-by-human": true
@@ -2695,7 +2695,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7460520537095208796
+          10658082538123731107
         ]
       ], 
       "reviewed-by-human": true
@@ -2704,7 +2704,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7291660642367442338
+          2778404448884516834
         ]
       ], 
       "reviewed-by-human": true
@@ -2713,7 +2713,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14762768585112190240
+          17563573072003390861
         ]
       ], 
       "reviewed-by-human": true
@@ -2731,7 +2731,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2476683591443888711
+          10144280827997820017
         ]
       ], 
       "reviewed-by-human": true
@@ -2740,7 +2740,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17041863101976913760
+          483960774711566369
         ]
       ], 
       "reviewed-by-human": true
@@ -2749,7 +2749,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5585387428193910993
+          10354111283999879826
         ]
       ], 
       "reviewed-by-human": true
@@ -2758,7 +2758,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          600546617215273168
+          7358899153122917782
         ]
       ], 
       "reviewed-by-human": true
@@ -2776,7 +2776,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12017996734769242584
+          18394383020181046608
         ]
       ], 
       "reviewed-by-human": true
@@ -3307,7 +3307,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3326756300818791255
+          9437982002609046613
         ]
       ], 
       "reviewed-by-human": true
@@ -3316,7 +3316,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11503434061632527023
+          5107091255796979515
         ]
       ], 
       "reviewed-by-human": true
@@ -3334,7 +3334,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11399285610425317631
+          8223869125637720467
         ]
       ], 
       "reviewed-by-human": true
@@ -3343,7 +3343,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5047815322358455926
+          8870116502735150189
         ]
       ], 
       "reviewed-by-human": true
@@ -3532,7 +3532,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7522047842497784488
+          15935717240228323960
         ]
       ], 
       "reviewed-by-human": true
@@ -3541,7 +3541,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16976334130763507258
+          313322311006398970
         ]
       ], 
       "reviewed-by-human": true
@@ -3550,7 +3550,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          751221660731865592
+          313322311006398970
         ]
       ], 
       "reviewed-by-human": true
@@ -3559,7 +3559,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17074122650246637487
+          627136558439243800
         ]
       ], 
       "reviewed-by-human": true
@@ -3568,10 +3568,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11009857797348161863
+          10463473947279642010
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "dashing3_565.png": {
       "allowed-digests": [
@@ -4865,7 +4865,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7282537335075785928
+          7681289742249109737
         ]
       ], 
       "reviewed-by-human": true
@@ -4874,7 +4874,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8863849031372460120
+          16377115640415455774
         ]
       ], 
       "reviewed-by-human": true
@@ -4883,7 +4883,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12032414562671442267
+          14038137379648542440
         ]
       ], 
       "reviewed-by-human": true
@@ -4892,7 +4892,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12812244415353974975
+          10135327325447528760
         ]
       ], 
       "reviewed-by-human": true
@@ -4901,16 +4901,16 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7753131063978727382
+          357429840762194099
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "emboss_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8642787233756750706
+          3118152546151315571
         ]
       ], 
       "reviewed-by-human": true
@@ -4919,7 +4919,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3438144398085081829
+          2019483616844304565
         ]
       ], 
       "reviewed-by-human": true
@@ -4928,7 +4928,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12941820665397400673
+          13281144005809760417
         ]
       ], 
       "reviewed-by-human": true
@@ -4937,7 +4937,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12941820665397400673
+          13281144005809760417
         ]
       ], 
       "reviewed-by-human": true
@@ -4946,7 +4946,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12941820665397400673
+          13281144005809760417
         ]
       ], 
       "reviewed-by-human": true
@@ -5180,7 +5180,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11559795738519917215
+          894010738745748016
         ]
       ], 
       "reviewed-by-human": true
@@ -5189,7 +5189,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11559795738519917215
+          894010738745748016
         ]
       ], 
       "reviewed-by-human": true
@@ -5198,7 +5198,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11559795738519917215
+          894010738745748016
         ]
       ], 
       "reviewed-by-human": true
@@ -5207,7 +5207,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11559795738519917215
+          894010738745748016
         ]
       ], 
       "reviewed-by-human": true
@@ -5216,7 +5216,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11559795738519917215
+          894010738745748016
         ]
       ], 
       "reviewed-by-human": true
@@ -5270,7 +5270,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7781767658511133788
+          14268548677040849696
         ]
       ], 
       "reviewed-by-human": true
@@ -5279,7 +5279,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15926472232550846517
+          5895228941510947093
         ]
       ], 
       "reviewed-by-human": true
@@ -5297,7 +5297,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9002062426255277430
+          16411074790464569158
         ]
       ], 
       "reviewed-by-human": true
@@ -5315,7 +5315,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6394623980536394421
+          18136397034817900979
         ]
       ], 
       "reviewed-by-human": true
@@ -5324,7 +5324,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4586322702989781686
+          8912060045544766918
         ]
       ], 
       "reviewed-by-human": true
@@ -5333,7 +5333,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11027690090981579357
+          13588896104045511478
         ]
       ], 
       "reviewed-by-human": true
@@ -5342,7 +5342,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1405934342638609234
+          14270116159944043609
         ]
       ], 
       "reviewed-by-human": true
@@ -5351,16 +5351,16 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10587067134950383884
+          5743151070812793840
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "filltypespersp_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          777617692643742677
+          5234941170738475581
         ]
       ], 
       "reviewed-by-human": true
@@ -5369,7 +5369,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10102869494909703223
+          1579804672408847994
         ]
       ], 
       "reviewed-by-human": true
@@ -5378,7 +5378,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2942412618550743965
+          3934963349431760733
         ]
       ], 
       "reviewed-by-human": true
@@ -5387,7 +5387,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8716703435560519381
+          1682989950586776498
         ]
       ], 
       "reviewed-by-human": true
@@ -5396,10 +5396,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7857489148100181041
+          11593745077767313878
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "filterbitmap_checkerboard_192_192_565.png": {
       "allowed-digests": [
@@ -7475,10 +7475,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14871433604768330356
+          12717069221660505630
         ]
       ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "gpusamplerstress_msaa16.png": {
       "allowed-digests": [
@@ -8087,7 +8087,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6127493291201765963
+          9435507764983792450
         ]
       ], 
       "reviewed-by-human": true
@@ -8096,7 +8096,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7917647863623017495
+          2869671884946577859
         ]
       ], 
       "reviewed-by-human": true
@@ -8105,7 +8105,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12198991168110095220
+          6526088802053247862
         ]
       ], 
       "reviewed-by-human": true
@@ -8114,7 +8114,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4804237682778641332
+          6280005804027151679
         ]
       ], 
       "reviewed-by-human": true