Revert 11839 (rebaseline images after r11835) due to performance regression in 11835

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

1 files changed, 65 insertions, 65 deletions

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 21ba29faf2..af0e3daa76 100644
--- 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
@@ -3340,7 +3340,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16086429144316222800
+          12187745034478815574
         ]
       ], 
       "ignore-failure": false
@@ -3349,7 +3349,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12832097210600987517
+          2279790276023385564
         ]
       ], 
       "ignore-failure": false
@@ -3358,7 +3358,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13342799139396893418
+          12801179152774323055
         ]
       ], 
       "ignore-failure": true
@@ -3379,7 +3379,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13497374237280200272
+          638108351894647772
         ]
       ], 
       "ignore-failure": false
@@ -3388,7 +3388,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13907447324398926215
+          14857491831751621993
         ]
       ], 
       "ignore-failure": false
@@ -3673,7 +3673,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3091278868454679377
+          9994220322587451901
         ]
       ], 
       "ignore-failure": false
@@ -3682,7 +3682,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          458516098289117147
+          547293323706939447
         ]
       ], 
       "ignore-failure": false
@@ -3691,7 +3691,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5543009677117349554
+          17538715812816685652
         ]
       ], 
       "ignore-failure": false
@@ -3700,7 +3700,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6644321117698340469
+          3967168504876408314
         ]
       ], 
       "bugs": [
@@ -7775,7 +7775,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18049884611606725658
+          11098308966987120525
         ]
       ], 
       "bugs": [
@@ -7787,7 +7787,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15044576251996291434
+          4748369698925058888
         ]
       ], 
       "ignore-failure": false
@@ -7796,7 +7796,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8931728342795143126
+          18213617527778384278
         ]
       ], 
       "ignore-failure": false
@@ -7988,7 +7988,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          175340572071609632
+          14065802421154606279
         ]
       ], 
       "ignore-failure": false
@@ -7997,7 +7997,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16117188635016165521
+          14156649764919184996
         ]
       ], 
       "ignore-failure": false
@@ -8006,7 +8006,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5912386647688398931
+          5886512921419392310
         ]
       ], 
       "ignore-failure": false
@@ -8015,7 +8015,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14146760604547591874
+          73449649865599504
         ]
       ], 
       "bugs": [
@@ -8251,7 +8251,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15215904068409697490
+          6080765140705084601
         ]
       ], 
       "ignore-failure": false
@@ -8260,7 +8260,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9231062927625063813
+          8672993302129071129
         ]
       ], 
       "ignore-failure": false
@@ -8269,7 +8269,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15451773828636305449
+          8442372175891164301
         ]
       ], 
       "ignore-failure": false
@@ -8278,7 +8278,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1313008434183403262
+          5577932092516740263
         ]
       ], 
       "bugs": [
@@ -8290,7 +8290,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15564974755024712566
+          5256789333859323566
         ]
       ], 
       "bugs": [
@@ -8302,7 +8302,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6224212202381569470
+          12154019601891195885
         ]
       ], 
       "bugs": [
@@ -8314,7 +8314,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13525338323091436151
+          15638450672370653982
         ]
       ], 
       "bugs": [
@@ -8326,7 +8326,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          818376873979411246
+          3195970560231649099
         ]
       ], 
       "bugs": [
@@ -8425,7 +8425,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16221158991138451766
+          17600675144457991335
         ]
       ], 
       "bugs": [
@@ -8437,7 +8437,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18423785200325361876
+          888248864640375674
         ]
       ], 
       "bugs": [
@@ -8449,7 +8449,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10669755241379109633
+          693368661475490253
         ]
       ], 
       "bugs": [
@@ -8461,7 +8461,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3158886282669776032
+          854717640088651026
         ]
       ], 
       "bugs": [
@@ -8796,7 +8796,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12500476634268646702
+          18077449755183549179
         ]
       ], 
       "ignore-failure": false
@@ -8805,7 +8805,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7427771316353723839
+          9893358655441672599
         ]
       ], 
       "ignore-failure": false
@@ -8814,7 +8814,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15459462110658121023
+          15387753642484027842
         ]
       ], 
       "ignore-failure": false
@@ -8823,7 +8823,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8087969977433548273
+          15908495008223763869
         ]
       ], 
       "bugs": [
@@ -8835,7 +8835,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5282045742696193491
+          1088651288841107202
         ]
       ], 
       "ignore-failure": false
@@ -8844,7 +8844,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4680908233490702695
+          3643810981030699795
         ]
       ], 
       "ignore-failure": false
@@ -8853,7 +8853,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1953725916667383831
+          4415411539668728280
         ]
       ], 
       "ignore-failure": false
@@ -8862,7 +8862,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17408268756123068627
+          4930814228292398375
         ]
       ], 
       "ignore-failure": false
@@ -8892,7 +8892,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7499929333346964018
+          12051647886698148623
         ]
       ], 
       "ignore-failure": false
@@ -8901,7 +8901,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7549436136151578932
+          3905425665304670228
         ]
       ], 
       "ignore-failure": false
@@ -8910,7 +8910,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11071760981678657789
+          5716664871600548973
         ]
       ], 
       "ignore-failure": false
@@ -8931,7 +8931,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1953725916667383831
+          4415411539668728280
         ]
       ], 
       "ignore-failure": false
@@ -8940,7 +8940,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17408268756123068627
+          4930814228292398375
         ]
       ], 
       "ignore-failure": false
@@ -8949,7 +8949,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1487038221596602173
+          11511430940574224209
         ]
       ], 
       "ignore-failure": false
@@ -8970,7 +8970,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7499929333346964018
+          12051647886698148623
         ]
       ], 
       "ignore-failure": false
@@ -8979,7 +8979,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7549436136151578932
+          3905425665304670228
         ]
       ], 
       "ignore-failure": false
@@ -8988,7 +8988,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11071760981678657789
+          5716664871600548973
         ]
       ], 
       "ignore-failure": false
@@ -8997,7 +8997,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1227572542640282461
+          1912366238246132128
         ]
       ], 
       "bugs": [
@@ -9018,7 +9018,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3349576543840513487
+          13601410097130905566
         ]
       ], 
       "bugs": [
@@ -9030,7 +9030,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9180818560842379201
+          9475945456907441291
         ]
       ], 
       "ignore-failure": false
@@ -9039,7 +9039,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10094008325673029893
+          1261420180657293626
         ]
       ], 
       "ignore-failure": false
@@ -9048,7 +9048,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17752415278946897
+          14858315402330837753
         ]
       ], 
       "ignore-failure": false
@@ -9735,7 +9735,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1566797545260704260
+          12268935119222444857
         ]
       ], 
       "bugs": [
@@ -9747,7 +9747,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6443390981079994389
+          18311176167067174521
         ]
       ], 
       "bugs": [
@@ -9759,7 +9759,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15435478586476187031
+          6187211769580820902
         ]
       ], 
       "bugs": [
@@ -9771,7 +9771,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3797804328159235006
+          17322558465401232983
         ]
       ], 
       "bugs": [
@@ -9783,7 +9783,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1566797545260704260
+          12268935119222444857
         ]
       ], 
       "ignore-failure": false
@@ -9792,7 +9792,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15610290292855764472
+          2751777684371556441
         ]
       ], 
       "ignore-failure": false
@@ -9801,7 +9801,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5901425230539228427
+          496123968430529012
         ]
       ], 
       "ignore-failure": false
@@ -10020,7 +10020,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8037142782025024059
+          11244881473901930050
         ]
       ], 
       "bugs": [
@@ -10032,7 +10032,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1985715765973457814
+          12265232586721009799
         ]
       ], 
       "ignore-failure": false
@@ -10041,7 +10041,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10195618960755484320
+          10414886409658539671
         ]
       ], 
       "ignore-failure": false
@@ -10050,7 +10050,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14162175307650847096
+          8678062996600544499
         ]
       ], 
       "bugs": [
@@ -10179,7 +10179,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7375397126145756591
+          2211050014668848369
         ]
       ], 
       "ignore-failure": false
@@ -10188,7 +10188,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15812794036622202228
+          16982103379696467486
         ]
       ], 
       "ignore-failure": false
@@ -10197,7 +10197,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2438178161049264351
+          7621311825251031603
         ]
       ], 
       "ignore-failure": false
@@ -10206,7 +10206,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5693000096705117542
+          10823722518852356136
         ]
       ], 
       "bugs": [