Various complex clip rebases

TBR= NOTRY= BUG=skia: Review URL: https://codereview.chromium.org/806223006
2014-12-18 07:04:12 -08:00 · 2014-12-18 07:04:12 -08:00 · 66644a830f
commit 66644a830f
parent b4a9c8914f
7 changed files with 13 additions and 10 deletions
--- a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
@ -4318,7 +4318,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          626475791193192305
+          2028896328237937243
        ]
      ], 
      "reviewed-by-human": true
@ -4457,7 +4457,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1484719816467256088
+          6518657330977248126
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
@ -3855,7 +3855,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          626475791193192305
+          2028896328237937243
        ]
      ], 
      "reviewed-by-human": true
@ -3967,7 +3967,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          1484719816467256088
+          6518657330977248126
        ]
      ], 
      "reviewed-by-human": true
--- a/expectations/gm/Test-Mac10.9-MacMini6.2-HD4000-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.9-MacMini6.2-HD4000-x86_64-Debug/expected-results.json
@ -5461,9 +5461,10 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8019470646677154193
+          15922084234916869542
        ]
      ], 
+      "ignore-failure": true, 
      "reviewed-by-human": true
    }, 
    "complexclip_aa_layer_pdf-mac.png": {
--- a/expectations/gm/Test-Mac10.9-MacMini6.2-HD4000-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.9-MacMini6.2-HD4000-x86_64-Release/expected-results.json
@ -5263,9 +5263,10 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          13742256918609331532
+          6219063277394539939
        ]
      ], 
+      "ignore-failure": true, 
      "reviewed-by-human": true
    }, 
    "complexclip2_path_aa_pdf-mac.png": {
@ -5539,9 +5540,10 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          8019470646677154193
+          15922084234916869542
        ]
      ], 
+      "ignore-failure": true, 
      "reviewed-by-human": true
    }, 
    "complexclip_aa_layer_pdf-mac.png": {
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
@ -3978,7 +3978,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3195308048840652908
+          2828959506249066798
        ]
      ], 
      "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
@ -3988,7 +3988,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          3195308048840652908
+          2828959506249066798
        ]
      ], 
      "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
@ -3988,7 +3988,7 @@
      "allowed-digests": [
        [
          "bitmap-64bitMD5", 
-          2828959506249066798
+          3195308048840652908
        ]
      ], 
      "reviewed-by-human": true