commit updated JSON expectations to experimental (based on gm-expectations at r10113)

Review URL: https://codereview.chromium.org/19399003

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

11 files changed, 181 insertions, 79 deletions

diff --git a/experimental/json-expectations/base-android-galaxy-nexus/expected-results.json b/experimental/json-expectations/base-android-galaxy-nexus/expected-results.json
index e902105f15..b75f409436 100644
--- a/experimental/json-expectations/base-android-galaxy-nexus/expected-results.json
+++ b/experimental/json-expectations/base-android-galaxy-nexus/expected-results.json
@@ -1986,12 +1986,6 @@
          ],
          "ignore-failure" : false
       },
-      "perlinnoise_msaa4.png" : {
-         "allowed-digests" : [
-            [ "bitmap-64bitMD5", 9445858459664344679 ]
-         ],
-         "ignore-failure" : false
-      },
       "points_565.png" : {
          "allowed-digests" : [
             [ "bitmap-64bitMD5", 9418063666161005464 ]
@@ -2396,7 +2390,7 @@
       },
       "strokes_round_msaa4.png" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 4027063125569595661 ]
+            [ "bitmap-64bitMD5", 17258287345365497349 ]
          ],
          "ignore-failure" : false
       },
@@ -2580,6 +2574,24 @@
          ],
          "ignore-failure" : false
       },
+      "xfermodeimagefilter_565.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 18285403550986146407 ]
+         ],
+         "ignore-failure" : false
+      },
+      "xfermodeimagefilter_8888.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 17728923405020117084 ]
+         ],
+         "ignore-failure" : false
+      },
+      "xfermodeimagefilter_gpu.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 17748042100952635690 ]
+         ],
+         "ignore-failure" : false
+      },
       "xfermodes2_565.png" : {
          "allowed-digests" : [
             [ "bitmap-64bitMD5", 10666835408059808238 ]
diff --git a/experimental/json-expectations/base-android-nexus-10/expected-results.json b/experimental/json-expectations/base-android-nexus-10/expected-results.json
index 0b59ebb535..7bead6b9c8 100644
--- a/experimental/json-expectations/base-android-nexus-10/expected-results.json
+++ b/experimental/json-expectations/base-android-nexus-10/expected-results.json
@@ -846,15 +846,9 @@
          ],
          "ignore-failure" : false
       },
-      "complexclip_aa_gpu.png" : {
-         "allowed-digests" : [
-            [ "bitmap-64bitMD5", 387039978924384594 ]
-         ],
-         "ignore-failure" : false
-      },
       "complexclip_aa_layer_gpu.png" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 5363319754699145462 ]
+            [ "bitmap-64bitMD5", 543374580301065327 ]
          ],
          "ignore-failure" : false
       },
@@ -870,12 +864,6 @@
          ],
          "ignore-failure" : false
       },
-      "complexclip_bw_gpu.png" : {
-         "allowed-digests" : [
-            [ "bitmap-64bitMD5", 9697308219893372737 ]
-         ],
-         "ignore-failure" : false
-      },
       "complexclip_bw_layer_8888.png" : {
          "allowed-digests" : [
             [ "bitmap-64bitMD5", 4677224699221098695 ]
@@ -884,7 +872,7 @@
       },
       "complexclip_bw_layer_gpu.png" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 4101494493688147934 ]
+            [ "bitmap-64bitMD5", 8798663377211972972 ]
          ],
          "ignore-failure" : false
       },
@@ -962,7 +950,7 @@
       },
       "dashcubics_gpu.png" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 6631290409534857336 ]
+            [ "bitmap-64bitMD5", 13130990206649275779 ]
          ],
          "ignore-failure" : false
       },
@@ -978,12 +966,6 @@
          ],
          "ignore-failure" : false
       },
-      "dashing2_msaa4.png" : {
-         "allowed-digests" : [
-            [ "bitmap-64bitMD5", 12021553253042702121 ]
-         ],
-         "ignore-failure" : false
-      },
       "dashing3_gpu.png" : {
          "allowed-digests" : [
             [ "bitmap-64bitMD5", 4457758322278983548 ]
@@ -1106,7 +1088,7 @@
       },
       "fatpathfill_gpu.png" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 14440050519611223857 ]
+            [ "bitmap-64bitMD5", 16228252805226699007 ]
          ],
          "ignore-failure" : false
       },
@@ -1484,7 +1466,7 @@
       },
       "hairlines_gpu.png" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 2996856280721898567 ]
+            [ "bitmap-64bitMD5", 17045817446176516276 ]
          ],
          "ignore-failure" : false
       },
@@ -1496,7 +1478,7 @@
       },
       "hairmodes_gpu.png" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 7920375013521613111 ]
+            [ "bitmap-64bitMD5", 13479740553126910464 ]
          ],
          "ignore-failure" : false
       },
@@ -1778,7 +1760,7 @@
       },
       "ovals_gpu.png" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 13391728668977025683 ]
+            [ "bitmap-64bitMD5", 7432755522530978334 ]
          ],
          "ignore-failure" : false
       },
@@ -1790,7 +1772,7 @@
       },
       "path-reverse_gpu.png" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 8931441255582374096 ]
+            [ "bitmap-64bitMD5", 16922763820093360567 ]
          ],
          "ignore-failure" : false
       },
@@ -1826,7 +1808,7 @@
       },
       "pathinterior_gpu.png" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 10009967145946807706 ]
+            [ "bitmap-64bitMD5", 1248119223542058491 ]
          ],
          "ignore-failure" : false
       },
@@ -1850,7 +1832,7 @@
       },
       "pathopsinverse_gpu.png" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 10961874962113421653 ]
+            [ "bitmap-64bitMD5", 5356924659458355983 ]
          ],
          "ignore-failure" : false
       },
@@ -1916,7 +1898,7 @@
       },
       "quadclosepath_msaa4.png" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 7683358787290320363 ]
+            [ "bitmap-64bitMD5", 16435201248381489322 ]
          ],
          "ignore-failure" : false
       },
@@ -1980,12 +1962,6 @@
          ],
          "ignore-failure" : false
       },
-      "roundrects_gpu.png" : {
-         "allowed-digests" : [
-            [ "bitmap-64bitMD5", 16329722811401337623 ]
-         ],
-         "ignore-failure" : false
-      },
       "roundrects_msaa4.png" : {
          "allowed-digests" : [
             [ "bitmap-64bitMD5", 3184421962035631986 ]
@@ -2072,7 +2048,7 @@
       },
       "samplerstress_gpu.png" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 9616227929451744187 ]
+            [ "bitmap-64bitMD5", 14763313431302138181 ]
          ],
          "ignore-failure" : false
       },
@@ -2246,7 +2222,7 @@
       },
       "strokerect_gpu.png" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 2305551550361968409 ]
+            [ "bitmap-64bitMD5", 11588000223360685987 ]
          ],
          "ignore-failure" : false
       },
@@ -2276,7 +2252,7 @@
       },
       "strokes3_gpu.png" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 5013382535803878918 ]
+            [ "bitmap-64bitMD5", 17474518009763808818 ]
          ],
          "ignore-failure" : false
       },
@@ -2316,12 +2292,6 @@
          ],
          "ignore-failure" : false
       },
-      "strokes_round_msaa4.png" : {
-         "allowed-digests" : [
-            [ "bitmap-64bitMD5", 1417895098825999963 ]
-         ],
-         "ignore-failure" : false
-      },
       "tablecolorfilter_gpu.png" : {
          "allowed-digests" : [
             [ "bitmap-64bitMD5", 14390703273660617396 ]
@@ -2550,15 +2520,27 @@
          ],
          "ignore-failure" : false
       },
+      "xfermodeimagefilter_565.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 18285403550986146407 ]
+         ],
+         "ignore-failure" : false
+      },
+      "xfermodeimagefilter_8888.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 17728923405020117084 ]
+         ],
+         "ignore-failure" : false
+      },
       "xfermodeimagefilter_gpu.png" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 2023551594977493250 ]
+            [ "bitmap-64bitMD5", 6041814176578458960 ]
          ],
          "ignore-failure" : false
       },
       "xfermodeimagefilter_msaa4.png" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 2023551594977493250 ]
+            [ "bitmap-64bitMD5", 6041814176578458960 ]
          ],
          "ignore-failure" : false
       },
diff --git a/experimental/json-expectations/base-android-nexus-4/expected-results.json b/experimental/json-expectations/base-android-nexus-4/expected-results.json
index a3b70e64ee..6af2d3bba1 100644
--- a/experimental/json-expectations/base-android-nexus-4/expected-results.json
+++ b/experimental/json-expectations/base-android-nexus-4/expected-results.json
@@ -1008,9 +1008,15 @@
          ],
          "ignore-failure" : false
       },
-      "xfermodeimagefilter_gpu.png" : {
+      "xfermodeimagefilter_565.png" : {
          "allowed-digests" : [
-            [ "bitmap-64bitMD5", 5927078721214492033 ]
+            [ "bitmap-64bitMD5", 18285403550986146407 ]
+         ],
+         "ignore-failure" : false
+      },
+      "xfermodeimagefilter_8888.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 17728923405020117084 ]
          ],
          "ignore-failure" : false
       },
diff --git a/experimental/json-expectations/base-android-nexus-7/expected-results.json b/experimental/json-expectations/base-android-nexus-7/expected-results.json
index d85e9a4858..b2eb37b8e0 100644
--- a/experimental/json-expectations/base-android-nexus-7/expected-results.json
+++ b/experimental/json-expectations/base-android-nexus-7/expected-results.json
@@ -2598,6 +2598,24 @@
          ],
          "ignore-failure" : false
       },
+      "xfermodeimagefilter_565.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 18285403550986146407 ]
+         ],
+         "ignore-failure" : false
+      },
+      "xfermodeimagefilter_8888.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 17728923405020117084 ]
+         ],
+         "ignore-failure" : false
+      },
+      "xfermodeimagefilter_gpu.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 18188178218070218508 ]
+         ],
+         "ignore-failure" : false
+      },
       "xfermodes2_565.png" : {
          "allowed-digests" : [
             [ "bitmap-64bitMD5", 10666835408059808238 ]
diff --git a/experimental/json-expectations/base-android-nexus-s/expected-results.json b/experimental/json-expectations/base-android-nexus-s/expected-results.json
index 209bb1661a..f6bb56d398 100644
--- a/experimental/json-expectations/base-android-nexus-s/expected-results.json
+++ b/experimental/json-expectations/base-android-nexus-s/expected-results.json
@@ -2574,6 +2574,24 @@
          ],
          "ignore-failure" : false
       },
+      "xfermodeimagefilter_565.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 18285403550986146407 ]
+         ],
+         "ignore-failure" : false
+      },
+      "xfermodeimagefilter_8888.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 17728923405020117084 ]
+         ],
+         "ignore-failure" : false
+      },
+      "xfermodeimagefilter_gpu.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 17748042100952635690 ]
+         ],
+         "ignore-failure" : false
+      },
       "xfermodes2_565.png" : {
          "allowed-digests" : [
             [ "bitmap-64bitMD5", 10666835408059808238 ]
diff --git a/experimental/json-expectations/base-macmini-lion-float/expected-results.json b/experimental/json-expectations/base-macmini-lion-float/expected-results.json
index 8baeb11f05..2eaae8b4ee 100644
--- a/experimental/json-expectations/base-macmini-lion-float/expected-results.json
+++ b/experimental/json-expectations/base-macmini-lion-float/expected-results.json
@@ -4548,6 +4548,30 @@
          ],
          "ignore-failure" : false
       },
+      "xfermodeimagefilter_565.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 3912758506216453832 ]
+         ],
+         "ignore-failure" : false
+      },
+      "xfermodeimagefilter_8888.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 5905960699123276019 ]
+         ],
+         "ignore-failure" : false
+      },
+      "xfermodeimagefilter_gpu.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 13197343644019524565 ]
+         ],
+         "ignore-failure" : false
+      },
+      "xfermodeimagefilter_mesa.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 16154173812381435207 ]
+         ],
+         "ignore-failure" : false
+      },
       "xfermodes2_565.png" : {
          "allowed-digests" : [
             [ "bitmap-64bitMD5", 14018365068324557661 ]
diff --git a/experimental/json-expectations/base-macmini/expected-results.json b/experimental/json-expectations/base-macmini/expected-results.json
index ef4aaf4dda..aab7f51dfd 100644
--- a/experimental/json-expectations/base-macmini/expected-results.json
+++ b/experimental/json-expectations/base-macmini/expected-results.json
@@ -4212,6 +4212,18 @@
          ],
          "ignore-failure" : false
       },
+      "xfermodeimagefilter_565.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 16044031134515745627 ]
+         ],
+         "ignore-failure" : false
+      },
+      "xfermodeimagefilter_8888.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 7031894771730398600 ]
+         ],
+         "ignore-failure" : false
+      },
       "xfermodes2_565.png" : {
          "allowed-digests" : [
             [ "bitmap-64bitMD5", 16105120026836608128 ]
diff --git a/experimental/json-expectations/base-macpro/expected-results.json b/experimental/json-expectations/base-macpro/expected-results.json
index 48d924b803..1ebe978eb6 100644
--- a/experimental/json-expectations/base-macpro/expected-results.json
+++ b/experimental/json-expectations/base-macpro/expected-results.json
@@ -5220,30 +5220,6 @@
          ],
          "ignore-failure" : false
       },
-      "xfermodeimagefilter_565.png" : {
-         "allowed-digests" : [
-            [ "bitmap-64bitMD5", 6206951979175401319 ]
-         ],
-         "ignore-failure" : false
-      },
-      "xfermodeimagefilter_8888.png" : {
-         "allowed-digests" : [
-            [ "bitmap-64bitMD5", 903796030758541433 ]
-         ],
-         "ignore-failure" : false
-      },
-      "xfermodeimagefilter_gpu.png" : {
-         "allowed-digests" : [
-            [ "bitmap-64bitMD5", 10621454621594633594 ]
-         ],
-         "ignore-failure" : false
-      },
-      "xfermodeimagefilter_pdf.png" : {
-         "allowed-digests" : [
-            [ "bitmap-64bitMD5", 5917216770549549299 ]
-         ],
-         "ignore-failure" : false
-      },
       "xfermodes2_565.png" : {
          "allowed-digests" : [
             [ "bitmap-64bitMD5", 12108513795501142465 ]
diff --git a/experimental/json-expectations/base-shuttle-win7-intel-directwrite/expected-results.json b/experimental/json-expectations/base-shuttle-win7-intel-directwrite/expected-results.json
index 48f641ff8e..f37763b03d 100644
--- a/experimental/json-expectations/base-shuttle-win7-intel-directwrite/expected-results.json
+++ b/experimental/json-expectations/base-shuttle-win7-intel-directwrite/expected-results.json
@@ -2562,6 +2562,24 @@
          ],
          "ignore-failure" : false
       },
+      "xfermodeimagefilter_565.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 7212610504022723405 ]
+         ],
+         "ignore-failure" : false
+      },
+      "xfermodeimagefilter_8888.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 12488691350505316367 ]
+         ],
+         "ignore-failure" : false
+      },
+      "xfermodeimagefilter_gpu.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 1407316955565186989 ]
+         ],
+         "ignore-failure" : false
+      },
       "xfermodes2_565.png" : {
          "allowed-digests" : [
             [ "bitmap-64bitMD5", 15503778794712337663 ]
diff --git a/experimental/json-expectations/base-shuttle-win7-intel-float/expected-results.json b/experimental/json-expectations/base-shuttle-win7-intel-float/expected-results.json
index 9958c3d2f5..c154eaae21 100644
--- a/experimental/json-expectations/base-shuttle-win7-intel-float/expected-results.json
+++ b/experimental/json-expectations/base-shuttle-win7-intel-float/expected-results.json
@@ -2574,6 +2574,24 @@
          ],
          "ignore-failure" : false
       },
+      "xfermodeimagefilter_565.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 13488322599746675210 ]
+         ],
+         "ignore-failure" : false
+      },
+      "xfermodeimagefilter_8888.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 1985674484636313705 ]
+         ],
+         "ignore-failure" : false
+      },
+      "xfermodeimagefilter_gpu.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 14915712913386950558 ]
+         ],
+         "ignore-failure" : false
+      },
       "xfermodes2_565.png" : {
          "allowed-digests" : [
             [ "bitmap-64bitMD5", 10867762899153607563 ]
diff --git a/experimental/json-expectations/base-shuttle_ubuntu12_ati5770/expected-results.json b/experimental/json-expectations/base-shuttle_ubuntu12_ati5770/expected-results.json
index 4aefd74fbf..e7d903a27e 100644
--- a/experimental/json-expectations/base-shuttle_ubuntu12_ati5770/expected-results.json
+++ b/experimental/json-expectations/base-shuttle_ubuntu12_ati5770/expected-results.json
@@ -2580,6 +2580,24 @@
          ],
          "ignore-failure" : false
       },
+      "xfermodeimagefilter_565.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 8190679453965955855 ]
+         ],
+         "ignore-failure" : false
+      },
+      "xfermodeimagefilter_8888.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 13436177922814180288 ]
+         ],
+         "ignore-failure" : false
+      },
+      "xfermodeimagefilter_gpu.png" : {
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 13275380747253794572 ]
+         ],
+         "ignore-failure" : false
+      },
       "xfermodes2_565.png" : {
          "allowed-digests" : [
             [ "bitmap-64bitMD5", 10791826234515004650 ]