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, 75 insertions, 75 deletions

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 f46b5f2013..4a79d8aa40 100644
--- 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
@@ -3760,7 +3760,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16086429144316222800
+          12187745034478815574
         ]
       ], 
       "ignore-failure": false
@@ -3769,7 +3769,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12832097210600987517
+          2279790276023385564
         ]
       ], 
       "ignore-failure": false
@@ -3778,7 +3778,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12603718176412980940
+          6594840172051778703
         ]
       ], 
       "ignore-failure": false
@@ -3805,7 +3805,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9309192421261384679
+          5170372133471052349
         ]
       ], 
       "ignore-failure": false
@@ -3814,7 +3814,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13497374237280200272
+          638108351894647772
         ]
       ], 
       "ignore-failure": false
@@ -3823,7 +3823,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13907447324398926215
+          14857491831751621993
         ]
       ], 
       "ignore-failure": false
@@ -3859,7 +3859,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2750583516678386939
+          4496493757018775051
         ]
       ], 
       "ignore-failure": false
@@ -4204,7 +4204,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3091278868454679377
+          9994220322587451901
         ]
       ], 
       "ignore-failure": false
@@ -4213,7 +4213,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          458516098289117147
+          547293323706939447
         ]
       ], 
       "ignore-failure": false
@@ -4222,7 +4222,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8566993550600084263
+          2984969891374594377
         ]
       ], 
       "ignore-failure": false
@@ -4249,7 +4249,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3083567077232451227
+          10450186095922965758
         ]
       ], 
       "ignore-failure": false
@@ -8996,7 +8996,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8052779512407496933
+          3864924002886018954
         ]
       ], 
       "bugs": [
@@ -9008,7 +9008,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2859292265306338980
+          12452103267642809042
         ]
       ], 
       "ignore-failure": false
@@ -9017,7 +9017,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4128518709659443791
+          1926121753474158366
         ]
       ], 
       "ignore-failure": false
@@ -9143,7 +9143,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16123340172201812866
+          13368313638144976985
         ]
       ], 
       "bugs": [
@@ -9155,7 +9155,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15356581678046831315
+          15400201194960863407
         ]
       ], 
       "bugs": [
@@ -9167,7 +9167,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2638906430515983326
+          2780966377086928223
         ]
       ], 
       "bugs": [
@@ -9179,7 +9179,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6236630724458150255
+          12027445432877973358
         ]
       ], 
       "bugs": [
@@ -9227,7 +9227,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6236630724458150255
+          12027445432877973358
         ]
       ], 
       "bugs": [
@@ -9239,7 +9239,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18202318038505709853
+          1465996387895782966
         ]
       ], 
       "ignore-failure": false
@@ -9248,7 +9248,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10399983904344778831
+          8326565878476961457
         ]
       ], 
       "ignore-failure": false
@@ -9257,7 +9257,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12482436274109624966
+          13659333152228788788
         ]
       ], 
       "ignore-failure": false
@@ -9284,7 +9284,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6626174980743063680
+          5324952688102935617
         ]
       ], 
       "ignore-failure": false
@@ -9565,7 +9565,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15215904068409697490
+          6080765140705084601
         ]
       ], 
       "ignore-failure": false
@@ -9574,7 +9574,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9231062927625063813
+          8672993302129071129
         ]
       ], 
       "ignore-failure": false
@@ -9583,7 +9583,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1931362810564927071
+          10742835085329109568
         ]
       ], 
       "ignore-failure": false
@@ -9601,7 +9601,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10924302742672496034
+          4076415110135789441
         ]
       ], 
       "ignore-failure": false
@@ -9610,7 +9610,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15564974755024712566
+          5256789333859323566
         ]
       ], 
       "bugs": [
@@ -9622,7 +9622,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6224212202381569470
+          12154019601891195885
         ]
       ], 
       "bugs": [
@@ -9634,7 +9634,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3197732157295020870
+          9363709709852153652
         ]
       ], 
       "bugs": [
@@ -9646,7 +9646,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2390623187014758164
+          3537709899083433797
         ]
       ], 
       "bugs": [
@@ -9760,7 +9760,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16221158991138451766
+          17600675144457991335
         ]
       ], 
       "bugs": [
@@ -9772,7 +9772,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18423785200325361876
+          888248864640375674
         ]
       ], 
       "bugs": [
@@ -9784,7 +9784,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11905005506493658103
+          3822977058491949864
         ]
       ], 
       "bugs": [
@@ -9796,7 +9796,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7003192889548204739
+          16574628642289757789
         ]
       ], 
       "bugs": [
@@ -10200,7 +10200,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12500476634268646702
+          11737442035852361954
         ]
       ], 
       "ignore-failure": false
@@ -10209,7 +10209,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7427771316353723839
+          3432212087878808896
         ]
       ], 
       "ignore-failure": false
@@ -10218,7 +10218,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6613976124055297399
+          11911498740450345721
         ]
       ], 
       "ignore-failure": false
@@ -10227,7 +10227,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15915162040448809270
+          17266228756747327221
         ]
       ], 
       "ignore-failure": false
@@ -10236,7 +10236,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5282045742696193491
+          1088651288841107202
         ]
       ], 
       "ignore-failure": false
@@ -10245,7 +10245,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4680908233490702695
+          3643810981030699795
         ]
       ], 
       "ignore-failure": false
@@ -10254,7 +10254,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1953725916667383831
+          4415411539668728280
         ]
       ], 
       "ignore-failure": false
@@ -10263,7 +10263,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17408268756123068627
+          4930814228292398375
         ]
       ], 
       "ignore-failure": false
@@ -10290,7 +10290,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14519928824569599644
+          13888302812961784127
         ]
       ], 
       "ignore-failure": false
@@ -10299,7 +10299,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7499929333346964018
+          12051647886698148623
         ]
       ], 
       "ignore-failure": false
@@ -10308,7 +10308,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7549436136151578932
+          3905425665304670228
         ]
       ], 
       "ignore-failure": false
@@ -10317,7 +10317,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11071760981678657789
+          5716664871600548973
         ]
       ], 
       "ignore-failure": false
@@ -10335,7 +10335,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14519928824569599644
+          13888302812961784127
         ]
       ], 
       "ignore-failure": false
@@ -10344,7 +10344,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1953725916667383831
+          4415411539668728280
         ]
       ], 
       "ignore-failure": false
@@ -10353,7 +10353,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17408268756123068627
+          4930814228292398375
         ]
       ], 
       "ignore-failure": false
@@ -10362,7 +10362,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16202199854255757188
+          12422588127925278461
         ]
       ], 
       "ignore-failure": false
@@ -10401,7 +10401,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7499929333346964018
+          12051647886698148623
         ]
       ], 
       "ignore-failure": false
@@ -10410,7 +10410,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7549436136151578932
+          3905425665304670228
         ]
       ], 
       "ignore-failure": false
@@ -10419,7 +10419,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11071760981678657789
+          5716664871600548973
         ]
       ], 
       "ignore-failure": false
@@ -10437,7 +10437,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7549436136151578932
+          3905425665304670228
         ]
       ], 
       "ignore-failure": false
@@ -10464,7 +10464,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16652340333564407243
+          9974338480477880442
         ]
       ], 
       "ignore-failure": false
@@ -10473,7 +10473,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5424064906652486548
+          8461791957067498836
         ]
       ], 
       "ignore-failure": false
@@ -10482,7 +10482,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3104227060752399509
+          2997257122563328353
         ]
       ], 
       "ignore-failure": false
@@ -10491,7 +10491,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5071906670715453393
+          5250561507509919605
         ]
       ], 
       "ignore-failure": false
@@ -10509,7 +10509,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17513534490056776383
+          6743358553272734304
         ]
       ], 
       "ignore-failure": false
@@ -11326,7 +11326,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14527652851826789000
+          6858604774280710163
         ]
       ], 
       "bugs": [
@@ -11338,7 +11338,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5836298189815751428
+          2189475882840572133
         ]
       ], 
       "bugs": [
@@ -11350,7 +11350,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12296900855438153276
+          14891154030282336865
         ]
       ], 
       "bugs": [
@@ -11374,7 +11374,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14527652851826789000
+          6858604774280710163
         ]
       ], 
       "ignore-failure": false
@@ -11383,7 +11383,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7724951429197626445
+          6718936472134770004
         ]
       ], 
       "ignore-failure": false
@@ -11392,7 +11392,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15183398843816241997
+          17191936081521943838
         ]
       ], 
       "ignore-failure": false
@@ -11683,7 +11683,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8037142782025024059
+          11244881473901930050
         ]
       ], 
       "bugs": [
@@ -11695,7 +11695,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1985715765973457814
+          12265232586721009799
         ]
       ], 
       "ignore-failure": false
@@ -11704,7 +11704,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8316501977645881153
+          3674213438441313584
         ]
       ], 
       "ignore-failure": false
@@ -11713,7 +11713,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8651862835529198871
+          2151334037883088085
         ]
       ], 
       "bugs": [
@@ -11881,7 +11881,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11136631028128791483
+          9815504881035319164
         ]
       ], 
       "ignore-failure": false
@@ -11890,7 +11890,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4367913927249814530
+          3878325917546891330
         ]
       ], 
       "ignore-failure": false
@@ -11899,7 +11899,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11705343106701513288
+          4154103985672329366
         ]
       ], 
       "ignore-failure": false
@@ -11917,7 +11917,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13265407502122182803
+          17420584811498185575
         ]
       ], 
       "ignore-failure": false
@@ -11926,7 +11926,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5693000096705117542
+          10823722518852356136
         ]
       ], 
       "bugs": [