Rebasing more conic stuff

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

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

1 files changed, 37 insertions, 60 deletions

diff --git a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
index 2b59626a49..86d663ce92 100644
--- a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
@@ -11906,7 +11906,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          594929016517741033
+          12470271812135321176
         ]
       ], 
       "reviewed-by-human": true
@@ -11915,7 +11915,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5721731372075929473
+          8914895884665824198
         ]
       ], 
       "reviewed-by-human": true
@@ -11924,7 +11924,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12674720521677422311
+          7093567958996476163
         ]
       ], 
       "reviewed-by-human": true
@@ -11933,7 +11933,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18352300921951772136
+          15518321750729694876
         ]
       ], 
       "reviewed-by-human": true
@@ -12407,7 +12407,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2337680673667749002
+          11478610349808930329
         ]
       ], 
       "reviewed-by-human": true
@@ -12416,7 +12416,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11178354341533563746
+          1680187521143619928
         ]
       ], 
       "reviewed-by-human": true
@@ -12434,7 +12434,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6681170505351868525
+          10691198430147736861
         ]
       ], 
       "reviewed-by-human": true
@@ -12737,7 +12737,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2706716911241639781
+          13723203022293277619
         ]
       ], 
       "reviewed-by-human": true
@@ -12746,13 +12746,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11952378473714520027
+          16696552045750968339
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "lerpmode_gpu.png": {
       "allowed-digests": [
@@ -12767,13 +12764,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17081090075293806168
+          5899561487020626345
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "lerpmode_pdf-poppler.png": {
       "allowed-digests": [
@@ -13019,7 +13013,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3614554396272078361
+          12192137677914155473
         ]
       ], 
       "reviewed-by-human": true
@@ -13028,7 +13022,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5817919243407825513
+          15472921174727083878
         ]
       ], 
       "reviewed-by-human": true
@@ -13046,9 +13040,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6220319036442058564
+          11379685151747762461
         ]
-      ]
+      ], 
+      "reviewed-by-human": true
     }, 
     "lumafilter_pdf-poppler.png": {
       "allowed-digests": [
@@ -13372,7 +13367,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1539651103309648647
+          2497210722374347242
         ]
       ], 
       "reviewed-by-human": true
@@ -13381,7 +13376,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3098095514584027141
+          14836810501821019661
         ]
       ], 
       "reviewed-by-human": true
@@ -13390,7 +13385,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9826021730348749408
+          12833751035901121975
         ]
       ], 
       "reviewed-by-human": true
@@ -14030,31 +14025,25 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16123340172201812866
+          10571933706553761352
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "nested_aa_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15356581678046831315
+          13680063892178866685
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "nested_aa_gpu.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2418024921014715433
+          11816602869569383598
         ]
       ], 
       "reviewed-by-human": true
@@ -14063,13 +14052,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16328662754522231592
+          6839787922737717131
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "nested_aa_pdf-poppler.png": {
       "allowed-digests": [
@@ -14087,25 +14073,19 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1642884649618332584
+          13903459090671434631
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "nested_bw_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2247784507927793592
+          6012955209340030318
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "nested_bw_gpu.png": {
       "allowed-digests": [
@@ -14123,13 +14103,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16328662754522231592
+          6839787922737717131
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "nested_bw_pdf-poppler.png": {
       "allowed-digests": [
@@ -14147,7 +14124,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2353651351546903350
+          18202318038505709853
         ]
       ], 
       "reviewed-by-human": true
@@ -14156,7 +14133,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12454353570070316868
+          10399983904344778831
         ]
       ], 
       "reviewed-by-human": true
@@ -14165,7 +14142,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13369221861824907819
+          12482436274109624966
         ]
       ], 
       "reviewed-by-human": true
@@ -14192,7 +14169,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          404663226500238408
+          8532637093157873796
         ]
       ], 
       "reviewed-by-human": true