From 0156c7646c83ee9932f016ff208cf339fec82446 Mon Sep 17 00:00:00 2001 From: kkinnunen Date: Mon, 23 Jun 2014 06:59:46 -0700 Subject: 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 --- .../expected-results.json | 6 +++--- .../gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json | 2 +- .../Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json | 2 +- .../Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json | 2 +- .../expected-results.json | 2 +- .../Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json | 2 +- .../expected-results.json | 2 +- .../Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json | 2 +- .../expected-results.json | 2 +- .../expected-results.json | 2 +- .../expected-results.json | 2 +- .../expected-results.json | 3 +-- .../expected-results.json | 2 +- .../gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json | 4 ++-- .../expected-results.json | 2 +- .../Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json | 4 ++-- .../expected-results.json | 4 ++-- .../gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json | 8 ++++---- .../Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json | 8 ++++---- .../Test-Win8-ShuttleA-GTX660-x86_64-Debug/expected-results.json | 8 ++++---- .../expected-results.json | 8 ++++---- .../gm/Test-Win8-ShuttleA-HD7770-x86-Debug/expected-results.json | 4 ++-- .../Test-Win8-ShuttleA-HD7770-x86-Release/expected-results.json | 4 ++-- .../Test-Win8-ShuttleA-HD7770-x86_64-Debug/expected-results.json | 4 ++-- .../expected-results.json | 4 ++-- 25 files changed, 46 insertions(+), 47 deletions(-) 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 66fab65491..ee2c37d9d3 100644 --- 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": { diff --git a/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json b/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json index f0837a459a..acc85502af 100644 --- 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 diff --git a/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json b/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json index 6d28eb8b26..54cf84cd20 100644 --- 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 diff --git a/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json b/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json index 3601e6b199..ae14031cfb 100644 --- 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 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 5d54db175d..55d066d8c3 100644 --- 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 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 e448f224b7..7fc0a93909 100644 --- 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 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 e448f224b7..7fc0a93909 100644 --- 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 diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json index c3dd96217b..1a5c1ed884 100644 --- 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 diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json index ee103b9f22..11a1505da3 100644 --- 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 diff --git 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 index 41ecf1ce4a..dae106c9f0 100644 --- 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 diff --git 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 index 3a33087a03..f75f0e5d68 100644 --- 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 diff --git 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 index 30558811de..f653df175c 100644 --- 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": { diff --git 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 index 2941b5a226..d3d66c7c2a 100644 --- 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 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 51365af8d5..53cb07d5b2 100644 --- 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 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 d00303b8af..434c8a4239 100644 --- 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 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 f72c7b551d..ceef6e5f1d 100644 --- 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 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 f72c7b551d..ceef6e5f1d 100644 --- 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 diff --git a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json index 1561734be0..260324287a 100644 --- 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 diff --git a/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json b/expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json index d3aee10e56..a1ddd1c0b0 100644 --- 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 diff --git 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 index 0c67a881c2..0d640b46cf 100644 --- 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 diff --git 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 index a78e0bd5f5..3899f5ccf4 100644 --- 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 diff --git a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Debug/expected-results.json b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Debug/expected-results.json index 7af6bb11a5..1f8984bf2b 100644 --- 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 diff --git a/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Release/expected-results.json b/expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Release/expected-results.json index d451aa6c3e..88ad3ca57e 100644 --- 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 diff --git 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 index 45b530da32..e337e5491d 100644 --- 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 diff --git 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 index 45b530da32..e337e5491d 100644 --- 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 -- cgit v1.2.3