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

diff --git a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
index dbcea4e51c..b277009157 100644
--- a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
@@ -4711,7 +4711,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16086429144316222800
+          12187745034478815574
         ]
       ], 
       "ignore-failure": false
@@ -4720,7 +4720,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12832097210600987517
+          2279790276023385564
         ]
       ], 
       "ignore-failure": false
@@ -4729,7 +4729,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12603718176412980940
+          6594840172051778703
         ]
       ], 
       "ignore-failure": false
@@ -4756,7 +4756,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7280089035152852576
+          7305681301403095619
         ]
       ], 
       "ignore-failure": false
@@ -4777,7 +4777,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13497374237280200272
+          638108351894647772
         ]
       ], 
       "ignore-failure": false
@@ -4786,7 +4786,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13907447324398926215
+          14857491831751621993
         ]
       ], 
       "ignore-failure": false
@@ -4822,7 +4822,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10098826938234021596
+          11846222883851843203
         ]
       ], 
       "ignore-failure": false
@@ -5236,7 +5236,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3091278868454679377
+          9994220322587451901
         ]
       ], 
       "ignore-failure": false
@@ -5245,7 +5245,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          458516098289117147
+          547293323706939447
         ]
       ], 
       "ignore-failure": false
@@ -5254,7 +5254,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8566993550600084263
+          2984969891374594377
         ]
       ], 
       "ignore-failure": false
@@ -5281,7 +5281,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3233705459955184197
+          15568776349831391559
         ]
       ], 
       "ignore-failure": false
@@ -5290,7 +5290,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6644321117698340469
+          3967168504876408314
         ]
       ], 
       "bugs": [
@@ -10839,7 +10839,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8052779512407496933
+          3864924002886018954
         ]
       ], 
       "bugs": [
@@ -10851,7 +10851,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2859292265306338980
+          12452103267642809042
         ]
       ], 
       "ignore-failure": false
@@ -10860,7 +10860,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4128518709659443791
+          1926121753474158366
         ]
       ], 
       "ignore-failure": false
@@ -11004,7 +11004,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16123340172201812866
+          13368313638144976985
         ]
       ], 
       "bugs": [
@@ -11016,7 +11016,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15356581678046831315
+          15400201194960863407
         ]
       ], 
       "bugs": [
@@ -11028,7 +11028,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2638906430515983326
+          2780966377086928223
         ]
       ], 
       "bugs": [
@@ -11040,7 +11040,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6236630724458150255
+          12027445432877973358
         ]
       ], 
       "bugs": [
@@ -11100,7 +11100,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6236630724458150255
+          12027445432877973358
         ]
       ], 
       "bugs": [
@@ -11124,7 +11124,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18202318038505709853
+          1465996387895782966
         ]
       ], 
       "ignore-failure": false
@@ -11133,7 +11133,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10399983904344778831
+          8326565878476961457
         ]
       ], 
       "ignore-failure": false
@@ -11142,7 +11142,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12482436274109624966
+          13659333152228788788
         ]
       ], 
       "ignore-failure": false
@@ -11169,7 +11169,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6626174980743063680
+          5324952688102935617
         ]
       ], 
       "ignore-failure": false
@@ -11178,7 +11178,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14146760604547591874
+          73449649865599504
         ]
       ], 
       "bugs": [
@@ -11515,7 +11515,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15215904068409697490
+          6080765140705084601
         ]
       ], 
       "ignore-failure": false
@@ -11524,7 +11524,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9231062927625063813
+          8672993302129071129
         ]
       ], 
       "ignore-failure": false
@@ -11533,7 +11533,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1931362810564927071
+          10742835085329109568
         ]
       ], 
       "ignore-failure": false
@@ -11551,7 +11551,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18269613487854965375
+          4076415110135789441
         ]
       ], 
       "ignore-failure": false
@@ -11560,7 +11560,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1313008434183403262
+          5577932092516740263
         ]
       ], 
       "bugs": [
@@ -11572,7 +11572,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15564974755024712566
+          5256789333859323566
         ]
       ], 
       "bugs": [
@@ -11584,7 +11584,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6224212202381569470
+          12154019601891195885
         ]
       ], 
       "bugs": [
@@ -11596,7 +11596,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3197732157295020870
+          9363709709852153652
         ]
       ], 
       "bugs": [
@@ -11608,7 +11608,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14373271793114112551
+          15644360700948066571
         ]
       ], 
       "bugs": [
@@ -11620,7 +11620,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          818376873979411246
+          3195970560231649099
         ]
       ], 
       "bugs": [
@@ -11758,7 +11758,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16221158991138451766
+          17600675144457991335
         ]
       ], 
       "bugs": [
@@ -11770,7 +11770,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18423785200325361876
+          888248864640375674
         ]
       ], 
       "bugs": [
@@ -11782,7 +11782,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11905005506493658103
+          3822977058491949864
         ]
       ], 
       "bugs": [
@@ -11794,7 +11794,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7003192889548204739
+          9091686337750871994
         ]
       ], 
       "bugs": [
@@ -11806,7 +11806,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3158886282669776032
+          854717640088651026
         ]
       ], 
       "bugs": [
@@ -12300,7 +12300,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12500476634268646702
+          11737442035852361954
         ]
       ], 
       "ignore-failure": false
@@ -12309,7 +12309,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7427771316353723839
+          3432212087878808896
         ]
       ], 
       "ignore-failure": false
@@ -12318,7 +12318,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6613976124055297399
+          11911498740450345721
         ]
       ], 
       "ignore-failure": false
@@ -12336,7 +12336,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14974553669084555279
+          2594097666586975096
         ]
       ], 
       "ignore-failure": false
@@ -12345,7 +12345,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8087969977433548273
+          15908495008223763869
         ]
       ], 
       "bugs": [
@@ -12357,7 +12357,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5282045742696193491
+          1088651288841107202
         ]
       ], 
       "ignore-failure": false
@@ -12366,7 +12366,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4680908233490702695
+          3643810981030699795
         ]
       ], 
       "ignore-failure": false
@@ -12375,7 +12375,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1953725916667383831
+          4415411539668728280
         ]
       ], 
       "ignore-failure": false
@@ -12384,7 +12384,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17408268756123068627
+          4930814228292398375
         ]
       ], 
       "ignore-failure": false
@@ -12411,7 +12411,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14519928824569599644
+          13888302812961784127
         ]
       ], 
       "ignore-failure": false
@@ -12432,7 +12432,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7499929333346964018
+          12051647886698148623
         ]
       ], 
       "ignore-failure": false
@@ -12441,7 +12441,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7549436136151578932
+          3905425665304670228
         ]
       ], 
       "ignore-failure": false
@@ -12450,7 +12450,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11071760981678657789
+          5716664871600548973
         ]
       ], 
       "ignore-failure": false
@@ -12468,7 +12468,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14519928824569599644
+          13888302812961784127
         ]
       ], 
       "ignore-failure": false
@@ -12489,7 +12489,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1953725916667383831
+          4415411539668728280
         ]
       ], 
       "ignore-failure": false
@@ -12498,7 +12498,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17408268756123068627
+          4930814228292398375
         ]
       ], 
       "ignore-failure": false
@@ -12507,7 +12507,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16202199854255757188
+          12422588127925278461
         ]
       ], 
       "ignore-failure": false
@@ -12546,7 +12546,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7499929333346964018
+          12051647886698148623
         ]
       ], 
       "ignore-failure": false
@@ -12555,7 +12555,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7549436136151578932
+          3905425665304670228
         ]
       ], 
       "ignore-failure": false
@@ -12564,7 +12564,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11071760981678657789
+          5716664871600548973
         ]
       ], 
       "ignore-failure": false
@@ -12582,7 +12582,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7549436136151578932
+          3905425665304670228
         ]
       ], 
       "ignore-failure": false
@@ -12591,7 +12591,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1227572542640282461
+          1912366238246132128
         ]
       ], 
       "bugs": [
@@ -12621,7 +12621,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11676811652511700648
+          14502943289443030251
         ]
       ], 
       "ignore-failure": false
@@ -12630,7 +12630,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3349576543840513487
+          13601410097130905566
         ]
       ], 
       "bugs": [
@@ -12642,7 +12642,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5424064906652486548
+          8461791957067498836
         ]
       ], 
       "ignore-failure": false
@@ -12651,7 +12651,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3104227060752399509
+          2997257122563328353
         ]
       ], 
       "ignore-failure": false
@@ -12660,7 +12660,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5071906670715453393
+          5250561507509919605
         ]
       ], 
       "ignore-failure": false
@@ -12678,7 +12678,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17513534490056776383
+          4052780158463777849
         ]
       ], 
       "ignore-failure": false
@@ -13602,7 +13602,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8585613743500055529
+          5295335393892765019
         ]
       ], 
       "bugs": [
@@ -13614,7 +13614,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7736769966823213707
+          3399551161317919453
         ]
       ], 
       "bugs": [
@@ -13626,7 +13626,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3077625869631780281
+          12405838161505536744
         ]
       ], 
       "bugs": [
@@ -13650,7 +13650,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11242594200052780203
+          17619156659755437346
         ]
       ], 
       "bugs": [
@@ -13662,7 +13662,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8585613743500055529
+          5295335393892765019
         ]
       ], 
       "ignore-failure": false
@@ -13671,7 +13671,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7749176276805545314
+          6944557815821583430
         ]
       ], 
       "ignore-failure": false
@@ -13680,7 +13680,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9213219612021670160
+          4643398443502137691
         ]
       ], 
       "ignore-failure": false
@@ -14004,7 +14004,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8037142782025024059
+          11244881473901930050
         ]
       ], 
       "bugs": [
@@ -14016,7 +14016,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1985715765973457814
+          12265232586721009799
         ]
       ], 
       "ignore-failure": false
@@ -14025,7 +14025,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8316501977645881153
+          3674213438441313584
         ]
       ], 
       "ignore-failure": false
@@ -14043,7 +14043,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4614446078092496182
+          10140064446492989489
         ]
       ], 
       "bugs": [
@@ -14055,7 +14055,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14162175307650847096
+          8678062996600544499
         ]
       ], 
       "bugs": [
@@ -14247,7 +14247,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11136631028128791483
+          9815504881035319164
         ]
       ], 
       "ignore-failure": false
@@ -14256,7 +14256,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4367913927249814530
+          3878325917546891330
         ]
       ], 
       "ignore-failure": false
@@ -14265,7 +14265,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11705343106701513288
+          4154103985672329366
         ]
       ], 
       "ignore-failure": false
@@ -14283,7 +14283,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1325642960216246317
+          9186520718131439855
         ]
       ], 
       "ignore-failure": false
@@ -14292,7 +14292,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5693000096705117542
+          10823722518852356136
         ]
       ], 
       "bugs": [