some fontscaler rebaselines

R=epoger@google.com

Review URL: https://codereview.chromium.org/23856007

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

diff --git a/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Release/expected-results.json b/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Release/expected-results.json
index 8348780..9942f89 100644 (file)
--- a/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Release/expected-results.json
@@ -3106,7 +3106,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2109058334061397010
+          9110002912964240820
         ]
       ], 
       "bugs": [
@@ -3118,7 +3118,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18351179394005277019
+          12880892936490474407
         ]
       ], 
       "bugs": [

diff --git a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json
index cc57501..1be74fe 100644 (file)
--- a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json
@@ -3472,7 +3472,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13880543447459531605
+          13513011321771319078
         ]
       ], 
       "ignore-failure": false
@@ -3481,7 +3481,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4564678130394561335
+          562789963914846860
         ]
       ], 
       "ignore-failure": false

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 72dedd4..8ae02c9 100644 (file)
--- a/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json
@@ -3196,7 +3196,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7224782654981343317
+          10477881289603512445
         ]
       ], 
       "bugs": [
@@ -3208,7 +3208,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11292348255909623174
+          17791808916267919807
         ]
       ], 
       "bugs": [

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 72dedd4..8ae02c9 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
@@ -3196,7 +3196,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7224782654981343317
+          10477881289603512445
         ]
       ], 
       "bugs": [
@@ -3208,7 +3208,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11292348255909623174
+          17791808916267919807
         ]
       ], 
       "bugs": [

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 229c7e9..e727223 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
@@ -3196,7 +3196,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15384757764489557934
+          11870356816304502296
         ]
       ], 
       "bugs": [
@@ -3208,7 +3208,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15469649018178758245
+          11207213356623164238
         ]
       ], 
       "bugs": [

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 229c7e9..e727223 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
@@ -3196,7 +3196,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15384757764489557934
+          11870356816304502296
         ]
       ], 
       "bugs": [
@@ -3208,7 +3208,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15469649018178758245
+          11207213356623164238
         ]
       ], 
       "bugs": [

diff --git a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/expected-results.json b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/expected-results.json
index 56cd6a7..cdceb9a 100644 (file)
--- a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/expected-results.json
@@ -7069,7 +7069,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10904058164649039414
+          13789531822458450208
         ]
       ], 
       "ignore-failure": false
@@ -7078,7 +7078,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1220198057032659357
+          8780229149883602827
         ]
       ], 
       "ignore-failure": false
@@ -7087,7 +7087,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11603117278907218936
+          3435885476716320759
         ]
       ], 
       "ignore-failure": false
@@ -7105,7 +7105,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10828180039430062728
+          14997656591432520916
         ]
       ], 
       "ignore-failure": false
@@ -7114,7 +7114,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10472196823580927700
+          3516231264404197043
         ]
       ], 
       "bugs": [

diff --git a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
index bc366f2..3bf3e20 100644 (file)
--- a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
@@ -6793,7 +6793,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10904058164649039414
+          13789531822458450208
         ]
       ], 
       "ignore-failure": false
@@ -6802,7 +6802,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1220198057032659357
+          8780229149883602827
         ]
       ], 
       "ignore-failure": false
@@ -6811,7 +6811,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11603117278907218936
+          3435885476716320759
         ]
       ], 
       "ignore-failure": false
@@ -6829,7 +6829,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          963019250202570206
+          18011346157842112766
         ]
       ], 
       "ignore-failure": false
@@ -6838,7 +6838,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10472196823580927700
+          3516231264404197043
         ]
       ], 
       "bugs": [

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 80d1ca2..3de38c5 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
@@ -6922,7 +6922,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10904058164649039414
+          13789531822458450208
         ]
       ], 
       "bugs": [
@@ -6934,7 +6934,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14343404306728031344
+          13260492348162985418
         ]
       ], 
       "bugs": [
@@ -6946,7 +6946,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6191681930895009143
+          12871035738108296016
         ]
       ], 
       "bugs": [
@@ -6958,7 +6958,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10828180039430062728
+          14997656591432520916
         ]
       ], 
       "bugs": [

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 2fa237c..1ca948c 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
@@ -6706,7 +6706,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10904058164649039414
+          13789531822458450208
         ]
       ], 
       "bugs": [
@@ -6718,7 +6718,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3735946954313365258
+          4537724508375691923
         ]
       ], 
       "bugs": [
@@ -6730,7 +6730,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18161007914246812720
+          2530193206350601725
         ]
       ], 
       "bugs": [
@@ -6742,7 +6742,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          963019250202570206
+          18011346157842112766
         ]
       ], 
       "bugs": [
@@ -6754,7 +6754,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10472196823580927700
+          3516231264404197043
         ]
       ], 
       "bugs": [

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 bd930c4..f5412f9 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
@@ -5860,7 +5860,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10421548270568332841
+          2496766675691923438
         ]
       ], 
       "ignore-failure": false
@@ -5869,7 +5869,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12196646901645504268
+          18141036390668309511
         ]
       ], 
       "ignore-failure": false
@@ -5878,7 +5878,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2797510902022254971
+          4405160322804582830
         ]
       ], 
       "ignore-failure": false
@@ -5887,7 +5887,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18414569070749554224
+          8159603483143834620
         ]
       ], 
       "bugs": [

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 d06a4d8..e94f6cc 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
@@ -5860,7 +5860,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14070171304247993658
+          14309461817718376442
         ]
       ], 
       "ignore-failure": false
@@ -5869,7 +5869,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6663857129399918145
+          6836544757862334411
         ]
       ], 
       "ignore-failure": false
@@ -5878,7 +5878,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13526672304990243356
+          7996677881755292113
         ]
       ], 
       "ignore-failure": false
@@ -5887,7 +5887,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18414569070749554224
+          8159603483143834620
         ]
       ], 
       "bugs": [

diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Debug/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Debug/expected-results.json
index c2f1583..34ed122 100644 (file)
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Debug/expected-results.json
@@ -5860,7 +5860,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10781800052824836874
+          2496766675691923438
         ]
       ], 
       "ignore-failure": false
@@ -5869,7 +5869,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17201632973350532776
+          18141036390668309511
         ]
       ], 
       "ignore-failure": false
@@ -5878,7 +5878,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          420130664062669047
+          13620858907799896168
         ]
       ], 
       "ignore-failure": false
@@ -5887,7 +5887,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18414569070749554224
+          8159603483143834620
         ]
       ], 
       "bugs": [

diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/expected-results.json
index 3e19261..6adc05a 100644 (file)
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/expected-results.json
@@ -5860,7 +5860,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10781800052824836874
+          2496766675691923438
         ]
       ], 
       "ignore-failure": false
@@ -5869,7 +5869,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17201632973350532776
+          18141036390668309511
         ]
       ], 
       "ignore-failure": false
@@ -5878,7 +5878,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          420130664062669047
+          13620858907799896168
         ]
       ], 
       "ignore-failure": false
@@ -5887,7 +5887,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18414569070749554224
+          8159603483143834620
         ]
       ], 
       "bugs": [

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 19f6b45..8afa43d 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
@@ -5152,7 +5152,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10781800052824836874
+          2496766675691923438
         ]
       ], 
       "ignore-failure": false
@@ -5161,7 +5161,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17201632973350532776
+          18141036390668309511
         ]
       ], 
       "ignore-failure": false
@@ -5179,7 +5179,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18414569070749554224
+          8159603483143834620
         ]
       ], 
       "bugs": [

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 cefb6b7..8d402bc 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
@@ -5903,7 +5903,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1366822866826182125
+          9499588106829924023
         ]
       ], 
       "ignore-failure": false
@@ -5912,7 +5912,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15140075070295963536
+          9187505713856674683
         ]
       ], 
       "ignore-failure": false
@@ -5921,7 +5921,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9512486868035760578
+          16738047539038188349
         ]
       ], 
       "ignore-failure": false
@@ -5930,7 +5930,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3589446423481163612
+          7448634616631920034
         ]
       ], 
       "bugs": [

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 45c37c4..2b1ce28 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
@@ -5903,7 +5903,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1366822866826182125
+          9499588106829924023
         ]
       ], 
       "ignore-failure": false
@@ -5912,7 +5912,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15140075070295963536
+          9187505713856674683
         ]
       ], 
       "ignore-failure": false
@@ -5921,7 +5921,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9512486868035760578
+          16738047539038188349
         ]
       ], 
       "ignore-failure": false
@@ -5930,7 +5930,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3589446423481163612
+          7448634616631920034
         ]
       ], 
       "bugs": [

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 d9ce49a..d350530 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
@@ -5903,7 +5903,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1366822866826182125
+          9499588106829924023
         ]
       ], 
       "ignore-failure": false
@@ -5912,7 +5912,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15140075070295963536
+          9187505713856674683
         ]
       ], 
       "ignore-failure": false
@@ -5921,7 +5921,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9512486868035760578
+          16738047539038188349
         ]
       ], 
       "ignore-failure": false
@@ -5930,7 +5930,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3589446423481163612
+          7448634616631920034
         ]
       ], 
       "bugs": [

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 d9ce49a..d350530 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
@@ -5903,7 +5903,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1366822866826182125
+          9499588106829924023
         ]
       ], 
       "ignore-failure": false
@@ -5912,7 +5912,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15140075070295963536
+          9187505713856674683
         ]
       ], 
       "ignore-failure": false
@@ -5921,7 +5921,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9512486868035760578
+          16738047539038188349
         ]
       ], 
       "ignore-failure": false
@@ -5930,7 +5930,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3589446423481163612
+          7448634616631920034
         ]
       ], 
       "bugs": [