Rebaseline shadertext2 after SkPaint::measureText changes

Rebaseline shadertext2 after commit "Fix SkPaint::measureText for stroked hairline text". Unignore ignored shadertext2 for Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug pdf-poppler. The label "Filled" in the test moves to the left due to the changes in the measurement. The SkPaint::measureText will use the "use paths" code path, similar to the drawing code. This results in different length for the string "Filled". As a side-note, the test probably measures either wrong text or uses wrong paint. This can be fixed separately. NOTREECHECKS=true NOTRY=true R=jvanverth@google.com, mtklein@google.com, rmistry@google.com Author: kkinnunen@nvidia.com Review URL: https://codereview.chromium.org/347393002
2014-06-23 06:59:46 -07:00 · 2014-06-23 06:59:46 -07:00 · 0156c7646c
commit 0156c7646c
parent c4b84aef1a
25 changed files with 46 additions and 47 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
@ -7222,7 +7222,7 @@
      "bugs": [
        1655
      ], 
-      "ignore-failure": true,
+      "ignore-failure": true, 
      "reviewed-by-human": true
    }, 
    "hairmodes_msaa4.png": {
@ -7235,7 +7235,7 @@
      "bugs": [
        1655
      ], 
-      "ignore-failure": true,
+      "ignore-failure": true, 
      "reviewed-by-human": true
    }, 
    "hittestpath_565.png": {
@ -7855,7 +7855,7 @@
      ], 
      "bugs": [
        1578
-      ],
+      ], 
      "reviewed-by-human": true
    }, 
    "lerpmode_msaa4.png": {
--- a/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json
@ -5484,7 +5484,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11165871866367438949
+          14844407893214099766
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json
@ -5479,7 +5479,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11165871866367438949
+          14844407893214099766
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json
@ -5632,7 +5632,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          17679372824216335614
+          13774536259610376683
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json
@ -5632,7 +5632,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          17679372824216335614
+          13774536259610376683
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -5626,7 +5626,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8189097946205624269
+          974977660301425412
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -5626,7 +5626,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8189097946205624269
+          974977660301425412
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json
@ -16494,7 +16494,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          223777537998895726
+          10235286573595132383
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json
@ -16728,7 +16728,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          223777537998895726
+          10235286573595132383
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug/expected-results.json
@ -16722,7 +16722,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          387202918560141756
+          8051735558131986459
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/expected-results.json
@ -16816,7 +16816,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          387202918560141756
+          8051735558131986459
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu13.10-ShuttleA-NoGPU-x86_64-Debug/expected-results.json
@ -9207,10 +9207,9 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          5483462587049856153
+          8357956844212052272
        ]
      ], 
-      "ignore-failure": true,
      "reviewed-by-human": true
    }, 
    "shadertext3_565.png": {
--- 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
@ -13004,7 +13004,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12504534449156720496
+          2504152509896673682
        ]
      ], 
      "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
@ -10621,7 +10621,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4721382661721666101
+          1898237381668598239
        ]
      ], 
      "reviewed-by-human": true
@ -10630,7 +10630,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8053365202385311069
+          3250614971945282083
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -13004,7 +13004,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12504534449156720496
+          2504152509896673682
        ]
      ], 
      "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
@ -10706,7 +10706,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4721382661721666101
+          1898237381668598239
        ]
      ], 
      "ignore-failure": false, 
@ -10716,7 +10716,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8053365202385311069
+          3250614971945282083
        ]
      ], 
      "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
@ -10706,7 +10706,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4721382661721666101
+          1898237381668598239
        ]
      ], 
      "ignore-failure": false, 
@ -10716,7 +10716,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8053365202385311069
+          3250614971945282083
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json
@ -16848,7 +16848,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4721382661721666101
+          1898237381668598239
        ]
      ], 
      "reviewed-by-human": true
@ -16857,7 +16857,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11081789658344209328
+          8372559706051131694
        ]
      ], 
      "reviewed-by-human": true
@ -16866,7 +16866,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6304960047606523701
+          3285314856458195690
        ]
      ], 
      "reviewed-by-human": true
@ -16875,7 +16875,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          17371546210615613853
+          6167804049792018932
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json
@ -16848,7 +16848,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4721382661721666101
+          1898237381668598239
        ]
      ], 
      "reviewed-by-human": true
@ -16857,7 +16857,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11081789658344209328
+          8372559706051131694
        ]
      ], 
      "reviewed-by-human": true
@ -16866,7 +16866,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6304960047606523701
+          3285314856458195690
        ]
      ], 
      "reviewed-by-human": true
@ -16875,7 +16875,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          17371546210615613853
+          6167804049792018932
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Debug/expected-results.json
@ -16848,7 +16848,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4721382661721666101
+          1898237381668598239
        ]
      ], 
      "reviewed-by-human": true
@ -16857,7 +16857,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11081789658344209328
+          8372559706051131694
        ]
      ], 
      "reviewed-by-human": true
@ -16866,7 +16866,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6304960047606523701
+          3285314856458195690
        ]
      ], 
      "reviewed-by-human": true
@ -16875,7 +16875,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          17371546210615613853
+          6167804049792018932
        ]
      ], 
      "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
@ -16849,7 +16849,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4721382661721666101
+          1898237381668598239
        ]
      ], 
      "reviewed-by-human": true
@ -16858,7 +16858,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          11081789658344209328
+          8372559706051131694
        ]
      ], 
      "reviewed-by-human": true
@ -16867,7 +16867,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          6304960047606523701
+          3285314856458195690
        ]
      ], 
      "reviewed-by-human": true
@ -16876,7 +16876,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          17371546210615613853
+          6167804049792018932
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Debug/expected-results.json
@ -11545,7 +11545,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4721382661721666101
+          1898237381668598239
        ]
      ], 
      "reviewed-by-human": true
@ -11554,7 +11554,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12858821977237734612
+          8206017788928062946
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Release/expected-results.json
@ -11545,7 +11545,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4721382661721666101
+          1898237381668598239
        ]
      ], 
      "reviewed-by-human": true
@ -11554,7 +11554,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12858821977237734612
+          8206017788928062946
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86_64-Debug/expected-results.json
@ -11545,7 +11545,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4721382661721666101
+          1898237381668598239
        ]
      ], 
      "reviewed-by-human": true
@ -11554,7 +11554,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12858821977237734612
+          8206017788928062946
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86_64-Release/expected-results.json
@ -11545,7 +11545,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4721382661721666101
+          1898237381668598239
        ]
      ], 
      "reviewed-by-human": true
@ -11554,7 +11554,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          12858821977237734612
+          8206017788928062946
        ]
      ], 
      "reviewed-by-human": true