rebase

TBR= NOTRY=True BUG=skia: Review URL: https://codereview.chromium.org/811243002
2014-12-17 17:13:37 -08:00 · 2014-12-17 17:13:37 -08:00 · 602a7428a3
commit 602a7428a3
parent 5531d51ce7
11 changed files with 54 additions and 54 deletions
--- a/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Debug/expected-results.json
@ -5884,7 +5884,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3273905294410702404
+          9787659696424703822
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Release/expected-results.json
@ -5876,7 +5876,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          17069077018466455997
+          380679879763982225
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
@ -13703,7 +13703,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6256097715324349553
+          11008373121672065627
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
@ -6073,7 +6073,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12564152640772304367
+          11557699419857364899
        ]
      ], 
      "reviewed-by-human": true
@ -11501,7 +11501,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6256097715324349553
+          11008373121672065627
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Debug/expected-results.json
@ -4973,7 +4973,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5767265637499000580
+          2942412618550743965
        ]
      ], 
      "reviewed-by-human": true
@ -10213,7 +10213,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          14067025671364900578
+          7976329634467536792
        ]
      ], 
      "reviewed-by-human": true
@ -10222,7 +10222,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          9352969135236811083
+          250005538281260273
        ]
      ], 
      "reviewed-by-human": true
@ -10231,10 +10231,10 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5415179396675387208
+          14792823735572726714
        ]
      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
    }, 
    "pathfill_565.png": {
      "allowed-digests": [
--- a/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Release/expected-results.json
@ -4972,7 +4972,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          15741786351214647198
+          13649867168113151636
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE/expected-results.json
@ -7337,7 +7337,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11946412809935919556
+          958136121808288846
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
@ -6922,7 +6922,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6940737243764937510
+          7775298570096891696
        ]
      ], 
      "reviewed-by-human": true
@ -6959,7 +6959,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6777672133164700613
+          12563966124941755321
        ]
      ], 
      "reviewed-by-human": true
@ -7000,7 +7000,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3761726957027384064
+          13055766478298685557
        ]
      ], 
      "ignore-failure": false, 
@ -7040,10 +7040,10 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6109517714117419633
+          16334966420230267651
        ]
      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
    }, 
    "gammatext_565.png": {
      "allowed-digests": [
@ -9085,7 +9085,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16818718173210917334
+          8728476020428093247
        ]
      ], 
      "ignore-failure": false, 
@ -9125,7 +9125,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2161077900614314915
+          18365153559857555560
        ]
      ], 
      "reviewed-by-human": true
@ -11813,7 +11813,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7261720940549232078
+          9285074111712134436
        ]
      ], 
      "reviewed-by-human": true
@ -13019,7 +13019,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          423475017097633778
+          7505529924413500925
        ]
      ], 
      "reviewed-by-human": true
@ -13513,7 +13513,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4954472096981762200
+          4225844776650217264
        ]
      ], 
      "ignore-failure": false, 
@ -13541,7 +13541,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6703295218647016900
+          15673306762075229748
        ]
      ], 
      "reviewed-by-human": true
@ -13787,7 +13787,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12300111888349865181
+          9904463010219406574
        ]
      ], 
      "reviewed-by-human": true
@ -13841,7 +13841,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7025230607614396892
+          9617306278203705233
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json
@ -6822,7 +6822,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          13151449337428384517
+          14726763257263620020
        ]
      ], 
      "reviewed-by-human": true
@ -6930,7 +6930,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6940737243764937510
+          7775298570096891696
        ]
      ], 
      "reviewed-by-human": true
@ -6967,7 +6967,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6777672133164700613
+          12563966124941755321
        ]
      ], 
      "reviewed-by-human": true
@ -7008,7 +7008,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3761726957027384064
+          13055766478298685557
        ]
      ], 
      "ignore-failure": false, 
@ -7048,10 +7048,10 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6109517714117419633
+          16334966420230267651
        ]
      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
    }, 
    "gammatext_565.png": {
      "allowed-digests": [
@ -9115,7 +9115,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16818718173210917334
+          8728476020428093247
        ]
      ], 
      "ignore-failure": false, 
@ -9155,7 +9155,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2161077900614314915
+          18365153559857555560
        ]
      ], 
      "reviewed-by-human": true
@ -11843,7 +11843,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7261720940549232078
+          9285074111712134436
        ]
      ], 
      "reviewed-by-human": true
@ -13065,7 +13065,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          423475017097633778
+          7505529924413500925
        ]
      ], 
      "reviewed-by-human": true
@ -13559,7 +13559,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4954472096981762200
+          4225844776650217264
        ]
      ], 
      "ignore-failure": false, 
@ -13587,7 +13587,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6703295218647016900
+          15673306762075229748
        ]
      ], 
      "reviewed-by-human": true
@ -13833,7 +13833,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12300111888349865181
+          9904463010219406574
        ]
      ], 
      "reviewed-by-human": true
@ -13887,7 +13887,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7025230607614396892
+          9617306278203705233
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json
@ -6822,7 +6822,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          13151449337428384517
+          14726763257263620020
        ]
      ], 
      "reviewed-by-human": true
@ -6930,7 +6930,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6940737243764937510
+          7775298570096891696
        ]
      ], 
      "reviewed-by-human": true
@ -6967,7 +6967,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6777672133164700613
+          12563966124941755321
        ]
      ], 
      "reviewed-by-human": true
@ -7008,7 +7008,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3761726957027384064
+          13055766478298685557
        ]
      ], 
      "ignore-failure": false, 
@ -7048,10 +7048,10 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6109517714117419633
+          16334966420230267651
        ]
      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
    }, 
    "gammatext_565.png": {
      "allowed-digests": [
@ -9115,7 +9115,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          16818718173210917334
+          8728476020428093247
        ]
      ], 
      "ignore-failure": false, 
@ -9155,7 +9155,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2161077900614314915
+          18365153559857555560
        ]
      ], 
      "reviewed-by-human": true
@ -11843,7 +11843,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7261720940549232078
+          9285074111712134436
        ]
      ], 
      "reviewed-by-human": true
@ -13065,7 +13065,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          423475017097633778
+          7505529924413500925
        ]
      ], 
      "reviewed-by-human": true
@ -13559,7 +13559,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4954472096981762200
+          4225844776650217264
        ]
      ], 
      "ignore-failure": false, 
@ -13587,7 +13587,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6703295218647016900
+          15673306762075229748
        ]
      ], 
      "reviewed-by-human": true
@ -13833,7 +13833,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12300111888349865181
+          9904463010219406574
        ]
      ], 
      "reviewed-by-human": true
@ -13887,7 +13887,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7025230607614396892
+          9617306278203705233
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Release/expected-results.json
@ -9433,7 +9433,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8024401618999367098
+          16165165724320799155
        ]
      ], 
      "reviewed-by-human": true