Rebasing more conic stuff

expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json

 {
   "actual-results": {
     "failed": null, 
     "failure-ignored": null, 
     "no-comparison": null, 
     "succeeded": null
   }, 
   "expected-results": {
     "3x3bitmaprect_565.png": {
       "allowed-digests": [
@@ skipping 8734 matching lines @@
       ], 
       "bugs": [
         1578
       ], 
       "reviewed-by-human": false
     }, 
     "image-surface_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2864408431884405012
+          16500645951850262558
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "image-surface_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3267759066044216448
+          9396400021466274180
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "image-surface_gpu.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          767755014954954375
+          5986796476286107879
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "image-surface_pdf-poppler.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
           12056409635015540104
         ]
@@ skipping 364 matching lines @@
       ], 
       "bugs": [
         1578
       ], 
       "reviewed-by-human": false
     }, 
     "imagefiltersscaled_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2337680673667749002
+          11478610349808930329
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "imagefiltersscaled_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11178354341533563746
+          1680187521143619928
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "imagefiltersscaled_gpu.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
           4596576699457741273
         ]
@@ skipping 224 matching lines @@
           "bitmap-64bitMD5", 
           18365153559857555560
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "lerpmode_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2706716911241639781
+          13723203022293277619
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "lerpmode_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11952378473714520027
+          16696552045750968339
         ]
       ], 
-      "bugs": [
-        1578
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "lerpmode_gpu.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
           16271637167989743463
         ]
       ], 
       "reviewed-by-human": true
     }, 
@@ skipping 168 matching lines @@
       ], 
       "bugs": [
         1578
       ], 
       "reviewed-by-human": false
     }, 
     "lumafilter_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12569413543973630689
+          1081718384063239172
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "lumafilter_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15730632135415729552
+          6769108630689567543
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "lumafilter_gpu.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
           17584525476237622529
         ]
@@ skipping 251 matching lines @@
       ], 
       "bugs": [
         1578
       ], 
       "reviewed-by-human": false
     }, 
     "mixed_xfermodes_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1539651103309648647
+          2497210722374347242
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "mixed_xfermodes_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14918941537433499795
+          14275905201463977510
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "mixed_xfermodes_gpu.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8979027025235113147
+          4101924253773888869
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "modecolorfilters_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
           7221526503067974995
         ]
@@ skipping 447 matching lines @@
           "bitmap-64bitMD5", 
           1189484382469245934
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "nested_aa_565.png": {
       "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", 
-          160373599874490692
+          6931748963241674074
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "nested_aa_pdf-poppler.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
           13966876451853453414
         ]
       ], 
       "bugs": [
         1578
       ], 
       "reviewed-by-human": false
     }, 
     "nested_bw_565.png": {
       "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": [
         [
           "bitmap-64bitMD5", 
           6638289994984814421
         ]
       ], 
       "bugs": [
         1578
       ], 
       "reviewed-by-human": false
     }, 
     "nested_bw_pdf-poppler.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
           13966876451853453414
         ]
       ], 
       "bugs": [
         1578
       ], 
       "reviewed-by-human": false
     }, 
     "ninepatch-stretch_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2353651351546903350
+          18202318038505709853
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "ninepatch-stretch_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12454353570070316868
+          10399983904344778831
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "ninepatch-stretch_gpu.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13965658733942805764
+          5912386647688398931
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "ninepatch-stretch_pdf-poppler.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
           2664237379710013683
         ]
@@ skipping 4038 matching lines @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
           12937422788648264516
         ]
       ], 
       "reviewed-by-human": true
     }
   }
 }