Rebasline for r12400.

git-svn-id: http://skia.googlecode.com/svn/trunk@12403 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
index 423b235..d90dab3 100644 (file)
--- 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": {

diff --git a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json
index f5cdea2..be01d1c 100644 (file)
--- 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": {

diff --git a/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json b/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json
index 0883236..80a500e 100644 (file)
--- 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": {

diff --git 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
index b3b2c30..7f77929 100644 (file)
--- 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": {

diff --git 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
index b3b2c30..7f77929 100644 (file)
--- 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": {

diff --git 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
index 317e32e..7641da1 100644 (file)
--- 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": {

diff --git 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
index ade1275..743fbf1 100644 (file)
--- 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": {

diff --git 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
index 89df3d4..caaec84 100644 (file)
--- 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": {

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 989a384..d14b996 100644 (file)
--- 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": {

diff --git 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
index d31b0ec..964263f 100644 (file)
--- 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": {

diff --git 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
index 35ec04a..09cb6eb 100644 (file)
--- 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": {

diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug/expected-results.json
index 3a5992c..fdd0ce5 100644 (file)
--- 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": {

diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Release/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Release/expected-results.json
index 31009a5..4d014d1 100644 (file)
--- 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": {

diff --git 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
index 63be5e1..e02d876 100644 (file)
--- 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": {

diff --git 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
index 0c8720a..d68a12b 100644 (file)
--- 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": {

diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
index 04e392d..2d328f5 100644 (file)
--- 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": {

diff --git 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
index 39bcba2..06375a3 100644 (file)
--- 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": {

diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
index 450fdaa..b6f3c43 100644 (file)
--- 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": {

diff --git 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
index 7790e15..d1c8f1f 100644 (file)
--- 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": {

diff --git 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
index 7790e15..d1c8f1f 100644 (file)
--- 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": {