Rebaseline Nexus-S and Nexus-4 GMs for r10640. Disabled complexclip_bw_layer_gpu

for Nexus-S due to glitch.

(SkipBuildbotRuns)


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

2 files changed, 30 insertions, 30 deletions

diff --git a/expectations/gm/base-android-nexus-4/expected-results.json b/expectations/gm/base-android-nexus-4/expected-results.json
index 309782086a..f000f420d1 100644
--- a/expectations/gm/base-android-nexus-4/expected-results.json
+++ b/expectations/gm/base-android-nexus-4/expected-results.json
@@ -550,7 +550,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10389883438780678606
+          485237628294360742
         ]
       ], 
       "ignore-failure": false
@@ -559,7 +559,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3577194492193648723
+          6699802286796635924
         ]
       ], 
       "ignore-failure": false
@@ -568,7 +568,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12667766993203707148
+          18145163516929754747
         ]
       ], 
       "ignore-failure": false
@@ -577,7 +577,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5883475138905220650
+          10725417271174656849
         ]
       ], 
       "ignore-failure": false
@@ -613,7 +613,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14590699292550118849
+          16118503939760967939
         ]
       ], 
       "ignore-failure": false
@@ -640,7 +640,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6037358077984560592
+          16108168154501778925
         ]
       ], 
       "ignore-failure": false
@@ -721,7 +721,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10403138627407579157
+          11063189793672002998
         ]
       ], 
       "ignore-failure": false
@@ -820,7 +820,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17806795773608718041
+          10672512564443764649
         ]
       ], 
       "ignore-failure": false
@@ -964,7 +964,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6241209310235207292
+          2469851025778145625
         ]
       ], 
       "ignore-failure": false
@@ -973,7 +973,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          6870984406142963887
+          454061878886646955
         ]
       ], 
       "ignore-failure": false
@@ -1141,7 +1141,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1874060958958504483
+          6189868505523739329
         ]
       ], 
       "ignore-failure": false
@@ -1159,7 +1159,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8014573766004268808
+          15274461929461247803
         ]
       ], 
       "ignore-failure": false
@@ -1177,7 +1177,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          344340342425352800
+          7958298316829911697
         ]
       ], 
       "ignore-failure": false
@@ -1393,7 +1393,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          9590153275800042560
+          16589503105976234708
         ]
       ], 
       "ignore-failure": false
@@ -1411,7 +1411,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14947400480439360508
+          12468753383876987802
         ]
       ], 
       "ignore-failure": false
diff --git a/expectations/gm/base-android-nexus-s/expected-results.json b/expectations/gm/base-android-nexus-s/expected-results.json
index dc1fd47948..1def96a014 100644
--- a/expectations/gm/base-android-nexus-s/expected-results.json
+++ b/expectations/gm/base-android-nexus-s/expected-results.json
@@ -1531,7 +1531,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4068240594950191475
+          17233951072109342877
         ]
       ], 
       "ignore-failure": false
@@ -1558,7 +1558,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17112872671235503160
+          1941660431693892979
         ]
       ], 
       "ignore-failure": false
@@ -1585,7 +1585,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12589171442930205276
+          11383579114933812926
         ]
       ], 
       "ignore-failure": false
@@ -1615,7 +1615,7 @@
           14415191697462606101
         ]
       ], 
-      "ignore-failure": false
+      "ignore-failure": true
     }, 
     "convexpaths_565.png": {
       "allowed-digests": [
@@ -1720,7 +1720,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10181646142017104451
+          524587554180182343
         ]
       ], 
       "ignore-failure": false
@@ -2512,7 +2512,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11475818625544129439
+          12399077255628061523
         ]
       ], 
       "ignore-failure": false
@@ -2878,7 +2878,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3561750164402735001
+          2487879147880039462
         ]
       ], 
       "ignore-failure": false
@@ -2905,7 +2905,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15001573149167641615
+          1755950731745182616
         ]
       ], 
       "ignore-failure": false
@@ -2932,7 +2932,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14491047724961059105
+          9410015784406609223
         ]
       ], 
       "ignore-failure": false
@@ -3184,7 +3184,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13974921987785276949
+          6449663699674696116
         ]
       ], 
       "ignore-failure": false
@@ -3319,7 +3319,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          3645723055904820816
+          8898458250496064128
         ]
       ], 
       "ignore-failure": false
@@ -3346,7 +3346,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16251568850682515806
+          124291989971718344
         ]
       ], 
       "ignore-failure": false
@@ -3517,7 +3517,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10926812021156678751
+          14834982898581954016
         ]
       ], 
       "ignore-failure": false
@@ -3571,7 +3571,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14754559443716605401
+          3344728193327166086
         ]
       ], 
       "ignore-failure": false
@@ -3964,4 +3964,4 @@
       "ignore-failure": false
     }
   }
-}
\ No newline at end of file
+}