rebase from early clip

TBR= BUG=skia: Review URL: https://codereview.chromium.org/707413003
2014-11-11 07:40:15 -08:00 · 2014-11-11 07:40:15 -08:00 · 43b46d1f56
commit 43b46d1f56
parent 69bb90c214
4 changed files with 3 additions and 5 deletions
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
@ -3836,7 +3836,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4355776770795120125
+          3115058516977276508
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -3846,7 +3846,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4355776770795120125
+          3115058516977276508
        ]
      ], 
      "reviewed-by-human": true
--- 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
@ -3846,7 +3846,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          4355776770795120125
+          3115058516977276508
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/ignored-tests.txt
+++ b/expectations/gm/ignored-tests.txt
@ -63,5 +63,3 @@ multipicturedraw_rrectclip_simple
 multipicturedraw_rrectclip_tiled
 multipicturedraw_sierpinski_simple
 multipicturedraw_sierpinski_tiled
-#joshualitt
-complexclip2_path_aa