Rebasline for r12400.

git-svn-id: http://skia.googlecode.com/svn/trunk@12403 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-26 22:15:49 +00:00 · 2013-11-26 22:15:49 +00:00 · 60b19b5dae
commit 60b19b5dae
parent ca5bb87a31
20 changed files with 33 additions and 132 deletions
--- a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
@ -3214,48 +3214,36 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2789357359936426897
+          16101291896048576683
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_8888.png": {
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11420474396559742656
+          6958362917585628191
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_gpu.png": {
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12902148816415894358
+          17182697123061500145
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_msaa4.png": {
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12902148816415894358
+          17182697123061500145
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "complexclip2_565.png": {
--- a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json
@ -2125,24 +2125,18 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2407516010050573816
+          7322753158848112633
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_8888.png": {
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5735401648209592903
+          13587257461703619696
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "complexclip2_565.png": {
--- a/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json
@ -1900,24 +1900,18 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          7633944210736451677
+          4723751871359287410
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_8888.png": {
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2594983628740042115
+          16275740961157987318
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "complexclip2_565.png": {
--- a/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json
@ -1900,24 +1900,18 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10175733445319554072
+          4055619075226987340
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_8888.png": {
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2036989462359391258
+          4557992853592297566
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "complexclip2_565.png": {
--- a/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Release/expected-results.json
@ -1900,24 +1900,18 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10175733445319554072
+          4055619075226987340
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_8888.png": {
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2036989462359391258
+          4557992853592297566
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "complexclip2_565.png": {
--- a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
@ -4588,12 +4588,9 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3224501961775566147
+          15826989673456070846
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_pdf-mac.png": {
--- a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/expected-results.json
@ -4048,12 +4048,9 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3224501961775566147
+          15826989673456070846
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_pdf-mac.png": {
--- a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
@ -3724,12 +3724,9 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3224501961775566147
+          15826989673456070846
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_pdf-mac.png": {
--- 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
@ -4927,12 +4927,9 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3224501961775566147
+          15826989673456070846
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_pdf-mac.png": {
--- a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release/expected-results.json
@ -4513,12 +4513,9 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3224501961775566147
+          15826989673456070846
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_pdf-mac.png": {
--- a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
@ -4378,12 +4378,9 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3224501961775566147
+          15826989673456070846
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_pdf-mac.png": {
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug/expected-results.json
@ -3502,36 +3502,27 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11405847735693538070
+          14602262721761630857
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_8888.png": {
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4978814888142061167
+          3481217777013051559
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_gpu.png": {
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10275865613222220507
+          16802525720487425080
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_pdf-poppler.png": {
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Release/expected-results.json
@ -3502,36 +3502,27 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11405847735693538070
+          14602262721761630857
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_8888.png": {
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4978814888142061167
+          3481217777013051559
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_gpu.png": {
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          10275865613222220507
+          16802525720487425080
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_pdf-poppler.png": {
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-NoGPU-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-NoGPU-x86_64-Debug/expected-results.json
@ -3142,24 +3142,18 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11405847735693538070
+          14602262721761630857
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_8888.png": {
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4978814888142061167
+          3481217777013051559
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_pdf-poppler.png": {
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite/expected-results.json
@ -3541,12 +3541,9 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2373323581539004655
+          14984702717513096997
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_pdf-poppler.png": {
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
@ -3523,12 +3523,9 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11235313591528676486
+          16744651928576717976
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_pdf-poppler.png": {
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json
@ -4684,24 +4684,18 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11235313591528676486
+          16744651928576717976
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_gpu.png": {
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11235313591528676486
+          16744651928576717976
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_pdf-poppler.png": {
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
@ -3523,12 +3523,9 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11235313591528676486
+          16744651928576717976
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_pdf-poppler.png": {
--- 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
@ -3523,12 +3523,9 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11235313591528676486
+          16744651928576717976
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_pdf-poppler.png": {
--- 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
@ -3523,12 +3523,9 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11235313591528676486
+          16744651928576717976
        ]
      ], 
-      "bugs": [
-        1578
-      ], 
      "reviewed-by-human": false
    }, 
    "colortype_pdf-poppler.png": {