diff --git a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/expected-results.json b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
index 5ac5602..c9f7b95 100644
--- a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "aarectmodes_pdf.png": {
+    "aarectmodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -155,7 +155,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "arithmode_pdf.png": {
+    "arithmode_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -200,7 +200,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bigmatrix_pdf.png": {
+    "bigmatrix_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -281,7 +281,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmapfilters_pdf.png": {
+    "bitmapfilters_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -326,7 +326,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmapscroll_pdf.png": {
+    "bitmapscroll_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -426,7 +426,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_inner_fast_pdf.png": {
+    "blurrect_25_100_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -462,7 +462,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_inner_slow_pdf.png": {
+    "blurrect_25_100_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -498,7 +498,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_normal_fast_pdf.png": {
+    "blurrect_25_100_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -534,7 +534,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_normal_slow_pdf.png": {
+    "blurrect_25_100_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -570,7 +570,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_outer_fast_pdf.png": {
+    "blurrect_25_100_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -606,7 +606,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_outer_slow_pdf.png": {
+    "blurrect_25_100_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -642,7 +642,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_inner_fast_pdf.png": {
+    "blurrect_25_100_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -678,7 +678,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_inner_slow_pdf.png": {
+    "blurrect_25_100_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -714,7 +714,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_normal_fast_pdf.png": {
+    "blurrect_25_100_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -750,7 +750,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_normal_slow_pdf.png": {
+    "blurrect_25_100_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -786,7 +786,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_outer_fast_pdf.png": {
+    "blurrect_25_100_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -822,7 +822,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_outer_slow_pdf.png": {
+    "blurrect_25_100_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -867,7 +867,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_inner_fast_pdf.png": {
+    "blurrect_5_100_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -903,7 +903,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_inner_slow_pdf.png": {
+    "blurrect_5_100_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -939,7 +939,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_normal_fast_pdf.png": {
+    "blurrect_5_100_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -975,7 +975,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_normal_slow_pdf.png": {
+    "blurrect_5_100_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1011,7 +1011,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_outer_fast_pdf.png": {
+    "blurrect_5_100_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1047,7 +1047,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_outer_slow_pdf.png": {
+    "blurrect_5_100_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1083,7 +1083,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_inner_fast_pdf.png": {
+    "blurrect_5_100_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1119,7 +1119,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_inner_slow_pdf.png": {
+    "blurrect_5_100_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1155,7 +1155,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_normal_fast_pdf.png": {
+    "blurrect_5_100_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1191,7 +1191,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_normal_slow_pdf.png": {
+    "blurrect_5_100_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1227,7 +1227,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_outer_fast_pdf.png": {
+    "blurrect_5_100_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1263,7 +1263,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_outer_slow_pdf.png": {
+    "blurrect_5_100_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1299,7 +1299,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_inner_fast_pdf.png": {
+    "blurrect_5_5_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1335,7 +1335,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_inner_slow_pdf.png": {
+    "blurrect_5_5_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1371,7 +1371,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_normal_fast_pdf.png": {
+    "blurrect_5_5_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1407,7 +1407,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_normal_slow_pdf.png": {
+    "blurrect_5_5_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1443,7 +1443,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_outer_fast_pdf.png": {
+    "blurrect_5_5_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1479,7 +1479,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_outer_slow_pdf.png": {
+    "blurrect_5_5_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1515,7 +1515,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_inner_fast_pdf.png": {
+    "blurrect_5_5_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1551,7 +1551,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_inner_slow_pdf.png": {
+    "blurrect_5_5_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1587,7 +1587,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_normal_fast_pdf.png": {
+    "blurrect_5_5_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1623,7 +1623,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_normal_slow_pdf.png": {
+    "blurrect_5_5_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1659,7 +1659,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_outer_fast_pdf.png": {
+    "blurrect_5_5_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1695,7 +1695,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_outer_slow_pdf.png": {
+    "blurrect_5_5_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1758,7 +1758,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_100_100_10_pdf.png": {
+    "blurrect_slow_100_100_10_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1803,7 +1803,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_100_100_2_pdf.png": {
+    "blurrect_slow_100_100_2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1848,7 +1848,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_10_100_10_pdf.png": {
+    "blurrect_slow_10_100_10_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1893,7 +1893,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_10_10_100_pdf.png": {
+    "blurrect_slow_10_10_100_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1947,7 +1947,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurs_pdf.png": {
+    "blurs_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2019,7 +2019,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "chrome_gradtext2_pdf.png": {
+    "chrome_gradtext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2073,7 +2073,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "circles_pdf.png": {
+    "circles_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2127,7 +2127,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "clamped_gradients_pdf.png": {
+    "clamped_gradients_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2190,7 +2190,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "colorfilterimagefilter_pdf.png": {
+    "colorfilterimagefilter_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2289,7 +2289,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_path_aa_pdf.png": {
+    "complexclip2_path_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2343,7 +2343,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_path_bw_pdf.png": {
+    "complexclip2_path_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2352,7 +2352,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_pdf.png": {
+    "complexclip2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2406,7 +2406,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_rect_aa_pdf.png": {
+    "complexclip2_rect_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2478,7 +2478,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_aa_layer_pdf.png": {
+    "complexclip_aa_layer_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2496,7 +2496,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_aa_pdf.png": {
+    "complexclip_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2568,7 +2568,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_bw_layer_pdf.png": {
+    "complexclip_bw_layer_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2595,7 +2595,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_bw_pdf.png": {
+    "complexclip_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2649,7 +2649,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "convexpaths_pdf.png": {
+    "convexpaths_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2694,7 +2694,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "cubicclosepath_pdf.png": {
+    "cubicclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2730,7 +2730,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "cubicpath_pdf.png": {
+    "cubicpath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2775,7 +2775,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashcubics_pdf.png": {
+    "dashcubics_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2820,7 +2820,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashing2_pdf.png": {
+    "dashing2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2865,7 +2865,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashing3_pdf.png": {
+    "dashing3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2937,7 +2937,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "degeneratesegments_pdf.png": {
+    "degeneratesegments_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3036,7 +3036,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawbitmapmatrix_pdf.png": {
+    "drawbitmapmatrix_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3090,7 +3090,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawbitmaprect_pdf.png": {
+    "drawbitmaprect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3135,7 +3135,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawlooper_pdf.png": {
+    "drawlooper_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3180,7 +3180,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "emptypath_pdf.png": {
+    "emptypath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3225,7 +3225,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filltypes_pdf.png": {
+    "filltypes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3279,7 +3279,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filltypespersp_pdf.png": {
+    "filltypespersp_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3315,7 +3315,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "fontscaler_pdf.png": {
+    "fontscaler_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3369,7 +3369,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gammatext_pdf.png": {
+    "gammatext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3603,7 +3603,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "giantbitmap_repeat_bilerp_scale_pdf.png": {
+    "giantbitmap_repeat_bilerp_scale_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3720,7 +3720,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_degenerate_2pt_pdf.png": {
+    "gradients_degenerate_2pt_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3783,7 +3783,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_local_perspective_pdf.png": {
+    "gradients_local_perspective_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3810,7 +3810,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_pdf.png": {
+    "gradients_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3864,7 +3864,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_view_perspective_pdf.png": {
+    "gradients_view_perspective_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3990,7 +3990,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imageblur_pdf.png": {
+    "imageblur_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4035,7 +4035,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imagefiltersbase_pdf.png": {
+    "imagefiltersbase_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4068,7 +4068,7 @@
         ]
       ]
     }, 
-    "imagefilterscropped_pdf.png": {
+    "imagefilterscropped_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4112,7 +4112,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imagefiltersgraph_pdf.png": {
+    "imagefiltersgraph_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4157,7 +4157,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lcdtext_pdf.png": {
+    "lcdtext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4211,7 +4211,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lighting_pdf.png": {
+    "lighting_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4265,7 +4265,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lineclosepath_pdf.png": {
+    "lineclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4301,7 +4301,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "linepath_pdf.png": {
+    "linepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4355,7 +4355,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "matrixconvolution_pdf.png": {
+    "matrixconvolution_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4418,7 +4418,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "morphology_pdf.png": {
+    "morphology_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4472,7 +4472,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "ninepatch-stretch_pdf.png": {
+    "ninepatch-stretch_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4544,7 +4544,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "ovals_pdf.png": {
+    "ovals_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4598,7 +4598,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "path-reverse_pdf.png": {
+    "path-reverse_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4652,7 +4652,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "patheffect_pdf.png": {
+    "patheffect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4697,7 +4697,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "pathfill_pdf.png": {
+    "pathfill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4751,7 +4751,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "pathinvfill_pdf.png": {
+    "pathinvfill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4814,7 +4814,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "points_pdf.png": {
+    "points_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4859,7 +4859,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "poly2poly_pdf.png": {
+    "poly2poly_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4904,7 +4904,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "quadclosepath_pdf.png": {
+    "quadclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4949,7 +4949,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "quadpath_pdf.png": {
+    "quadpath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5003,7 +5003,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "radial_gradient_pdf.png": {
+    "radial_gradient_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5039,7 +5039,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rects_pdf.png": {
+    "rects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5075,7 +5075,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "roundrects_pdf.png": {
+    "roundrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5138,7 +5138,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_aa_pdf.png": {
+    "rrect_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5183,7 +5183,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_bw_pdf.png": {
+    "rrect_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5228,7 +5228,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_clip_aa_pdf.png": {
+    "rrect_clip_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5273,7 +5273,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_clip_bw_pdf.png": {
+    "rrect_clip_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5300,7 +5300,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_pdf.png": {
+    "rrect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5345,7 +5345,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "samplerstress_pdf.png": {
+    "samplerstress_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5399,7 +5399,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shaderbounds_linear_pdf.png": {
+    "shaderbounds_linear_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5435,7 +5435,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext2_pdf.png": {
+    "shadertext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5480,7 +5480,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext3_pdf.png": {
+    "shadertext3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5534,7 +5534,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext_pdf.png": {
+    "shadertext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5588,7 +5588,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadows_pdf.png": {
+    "shadows_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5633,7 +5633,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "simpleaaclip_path_pdf.png": {
+    "simpleaaclip_path_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5687,7 +5687,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "simpleaaclip_rect_pdf.png": {
+    "simpleaaclip_rect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5741,7 +5741,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "stroke-fill_pdf.png": {
+    "stroke-fill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5804,7 +5804,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokerects_pdf.png": {
+    "strokerects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5858,7 +5858,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes3_pdf.png": {
+    "strokes3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5903,7 +5903,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes_poly_pdf.png": {
+    "strokes_poly_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5948,7 +5948,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes_round_pdf.png": {
+    "strokes_round_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5993,7 +5993,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tablecolorfilter_pdf.png": {
+    "tablecolorfilter_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6047,7 +6047,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "testimagefilters_pdf.png": {
+    "testimagefilters_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6092,7 +6092,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "texdata_pdf.png": {
+    "texdata_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6137,7 +6137,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "texteffects_pdf.png": {
+    "texteffects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6173,7 +6173,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "thinrects_pdf.png": {
+    "thinrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6209,7 +6209,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "thinstrokedrects_pdf.png": {
+    "thinstrokedrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6263,7 +6263,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tilemodes_pdf.png": {
+    "tilemodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6308,7 +6308,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tinybitmap_pdf.png": {
+    "tinybitmap_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6353,7 +6353,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "twopointconical_pdf.png": {
+    "twopointconical_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6389,7 +6389,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "verttext2_pdf.png": {
+    "verttext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6434,7 +6434,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "verttext_pdf.png": {
+    "verttext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6488,7 +6488,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "xfermodes2_pdf.png": {
+    "xfermodes2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6521,7 +6521,7 @@
         ]
       ]
     }, 
-    "xfermodes3_pdf.png": {
+    "xfermodes3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6574,7 +6574,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "xfermodes_pdf.png": {
+    "xfermodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/expected-results.json b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/expected-results.json
index c097b04..f1aefd6 100644
--- a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/expected-results.json
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "aarectmodes_pdf.png": {
+    "aarectmodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -155,7 +155,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "arithmode_pdf.png": {
+    "arithmode_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -200,7 +200,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bigmatrix_pdf.png": {
+    "bigmatrix_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -281,7 +281,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmapfilters_pdf.png": {
+    "bitmapfilters_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -326,7 +326,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmapscroll_pdf.png": {
+    "bitmapscroll_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -426,7 +426,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_inner_fast_pdf.png": {
+    "blurrect_25_100_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -462,7 +462,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_inner_slow_pdf.png": {
+    "blurrect_25_100_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -498,7 +498,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_normal_fast_pdf.png": {
+    "blurrect_25_100_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -534,7 +534,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_normal_slow_pdf.png": {
+    "blurrect_25_100_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -570,7 +570,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_outer_fast_pdf.png": {
+    "blurrect_25_100_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -606,7 +606,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_outer_slow_pdf.png": {
+    "blurrect_25_100_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -642,7 +642,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_inner_fast_pdf.png": {
+    "blurrect_25_100_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -678,7 +678,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_inner_slow_pdf.png": {
+    "blurrect_25_100_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -714,7 +714,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_normal_fast_pdf.png": {
+    "blurrect_25_100_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -750,7 +750,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_normal_slow_pdf.png": {
+    "blurrect_25_100_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -786,7 +786,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_outer_fast_pdf.png": {
+    "blurrect_25_100_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -822,7 +822,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_outer_slow_pdf.png": {
+    "blurrect_25_100_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -867,7 +867,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_inner_fast_pdf.png": {
+    "blurrect_5_100_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -903,7 +903,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_inner_slow_pdf.png": {
+    "blurrect_5_100_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -939,7 +939,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_normal_fast_pdf.png": {
+    "blurrect_5_100_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -975,7 +975,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_normal_slow_pdf.png": {
+    "blurrect_5_100_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1011,7 +1011,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_outer_fast_pdf.png": {
+    "blurrect_5_100_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1047,7 +1047,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_outer_slow_pdf.png": {
+    "blurrect_5_100_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1083,7 +1083,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_inner_fast_pdf.png": {
+    "blurrect_5_100_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1119,7 +1119,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_inner_slow_pdf.png": {
+    "blurrect_5_100_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1155,7 +1155,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_normal_fast_pdf.png": {
+    "blurrect_5_100_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1191,7 +1191,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_normal_slow_pdf.png": {
+    "blurrect_5_100_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1227,7 +1227,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_outer_fast_pdf.png": {
+    "blurrect_5_100_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1263,7 +1263,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_outer_slow_pdf.png": {
+    "blurrect_5_100_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1299,7 +1299,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_inner_fast_pdf.png": {
+    "blurrect_5_5_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1335,7 +1335,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_inner_slow_pdf.png": {
+    "blurrect_5_5_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1371,7 +1371,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_normal_fast_pdf.png": {
+    "blurrect_5_5_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1407,7 +1407,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_normal_slow_pdf.png": {
+    "blurrect_5_5_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1443,7 +1443,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_outer_fast_pdf.png": {
+    "blurrect_5_5_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1479,7 +1479,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_outer_slow_pdf.png": {
+    "blurrect_5_5_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1515,7 +1515,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_inner_fast_pdf.png": {
+    "blurrect_5_5_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1551,7 +1551,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_inner_slow_pdf.png": {
+    "blurrect_5_5_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1587,7 +1587,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_normal_fast_pdf.png": {
+    "blurrect_5_5_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1623,7 +1623,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_normal_slow_pdf.png": {
+    "blurrect_5_5_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1659,7 +1659,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_outer_fast_pdf.png": {
+    "blurrect_5_5_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1695,7 +1695,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_outer_slow_pdf.png": {
+    "blurrect_5_5_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1758,7 +1758,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_100_100_10_pdf.png": {
+    "blurrect_slow_100_100_10_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1803,7 +1803,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_100_100_2_pdf.png": {
+    "blurrect_slow_100_100_2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1848,7 +1848,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_10_100_10_pdf.png": {
+    "blurrect_slow_10_100_10_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1893,7 +1893,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_10_10_100_pdf.png": {
+    "blurrect_slow_10_10_100_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1947,7 +1947,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurs_pdf.png": {
+    "blurs_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2019,7 +2019,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "chrome_gradtext2_pdf.png": {
+    "chrome_gradtext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2073,7 +2073,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "circles_pdf.png": {
+    "circles_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2127,7 +2127,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "clamped_gradients_pdf.png": {
+    "clamped_gradients_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2190,7 +2190,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "colorfilterimagefilter_pdf.png": {
+    "colorfilterimagefilter_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2289,7 +2289,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_path_aa_pdf.png": {
+    "complexclip2_path_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2343,7 +2343,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_path_bw_pdf.png": {
+    "complexclip2_path_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2352,7 +2352,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_pdf.png": {
+    "complexclip2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2406,7 +2406,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_rect_aa_pdf.png": {
+    "complexclip2_rect_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2478,7 +2478,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_aa_layer_pdf.png": {
+    "complexclip_aa_layer_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2496,7 +2496,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_aa_pdf.png": {
+    "complexclip_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2568,7 +2568,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_bw_layer_pdf.png": {
+    "complexclip_bw_layer_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2595,7 +2595,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_bw_pdf.png": {
+    "complexclip_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2649,7 +2649,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "convexpaths_pdf.png": {
+    "convexpaths_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2694,7 +2694,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "cubicclosepath_pdf.png": {
+    "cubicclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2730,7 +2730,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "cubicpath_pdf.png": {
+    "cubicpath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2775,7 +2775,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashcubics_pdf.png": {
+    "dashcubics_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2820,7 +2820,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashing2_pdf.png": {
+    "dashing2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2865,7 +2865,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashing3_pdf.png": {
+    "dashing3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2937,7 +2937,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "degeneratesegments_pdf.png": {
+    "degeneratesegments_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3036,7 +3036,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawbitmapmatrix_pdf.png": {
+    "drawbitmapmatrix_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3090,7 +3090,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawbitmaprect_pdf.png": {
+    "drawbitmaprect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3135,7 +3135,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawlooper_pdf.png": {
+    "drawlooper_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3180,7 +3180,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "emptypath_pdf.png": {
+    "emptypath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3225,7 +3225,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filltypes_pdf.png": {
+    "filltypes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3279,7 +3279,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filltypespersp_pdf.png": {
+    "filltypespersp_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3315,7 +3315,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "fontscaler_pdf.png": {
+    "fontscaler_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3369,7 +3369,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gammatext_pdf.png": {
+    "gammatext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3603,7 +3603,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "giantbitmap_repeat_bilerp_scale_pdf.png": {
+    "giantbitmap_repeat_bilerp_scale_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3720,7 +3720,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_degenerate_2pt_pdf.png": {
+    "gradients_degenerate_2pt_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3783,7 +3783,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_local_perspective_pdf.png": {
+    "gradients_local_perspective_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3810,7 +3810,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_pdf.png": {
+    "gradients_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3864,7 +3864,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_view_perspective_pdf.png": {
+    "gradients_view_perspective_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3990,7 +3990,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imageblur_pdf.png": {
+    "imageblur_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4035,7 +4035,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imagefiltersbase_pdf.png": {
+    "imagefiltersbase_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4068,7 +4068,7 @@
         ]
       ]
     }, 
-    "imagefilterscropped_pdf.png": {
+    "imagefilterscropped_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4112,7 +4112,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imagefiltersgraph_pdf.png": {
+    "imagefiltersgraph_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4157,7 +4157,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lcdtext_pdf.png": {
+    "lcdtext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4211,7 +4211,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lighting_pdf.png": {
+    "lighting_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4265,7 +4265,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lineclosepath_pdf.png": {
+    "lineclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4301,7 +4301,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "linepath_pdf.png": {
+    "linepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4355,7 +4355,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "matrixconvolution_pdf.png": {
+    "matrixconvolution_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4418,7 +4418,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "morphology_pdf.png": {
+    "morphology_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4472,7 +4472,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "ninepatch-stretch_pdf.png": {
+    "ninepatch-stretch_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4544,7 +4544,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "ovals_pdf.png": {
+    "ovals_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4598,7 +4598,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "path-reverse_pdf.png": {
+    "path-reverse_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4652,7 +4652,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "patheffect_pdf.png": {
+    "patheffect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4697,7 +4697,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "pathfill_pdf.png": {
+    "pathfill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4751,7 +4751,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "pathinvfill_pdf.png": {
+    "pathinvfill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4814,7 +4814,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "points_pdf.png": {
+    "points_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4859,7 +4859,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "poly2poly_pdf.png": {
+    "poly2poly_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4904,7 +4904,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "quadclosepath_pdf.png": {
+    "quadclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4949,7 +4949,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "quadpath_pdf.png": {
+    "quadpath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5003,7 +5003,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "radial_gradient_pdf.png": {
+    "radial_gradient_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5039,7 +5039,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rects_pdf.png": {
+    "rects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5075,7 +5075,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "roundrects_pdf.png": {
+    "roundrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5138,7 +5138,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_aa_pdf.png": {
+    "rrect_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5183,7 +5183,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_bw_pdf.png": {
+    "rrect_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5228,7 +5228,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_clip_aa_pdf.png": {
+    "rrect_clip_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5273,7 +5273,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_clip_bw_pdf.png": {
+    "rrect_clip_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5300,7 +5300,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_pdf.png": {
+    "rrect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5345,7 +5345,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "samplerstress_pdf.png": {
+    "samplerstress_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5399,7 +5399,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shaderbounds_linear_pdf.png": {
+    "shaderbounds_linear_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5435,7 +5435,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext2_pdf.png": {
+    "shadertext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5480,7 +5480,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext3_pdf.png": {
+    "shadertext3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5534,7 +5534,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext_pdf.png": {
+    "shadertext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5588,7 +5588,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadows_pdf.png": {
+    "shadows_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5633,7 +5633,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "simpleaaclip_path_pdf.png": {
+    "simpleaaclip_path_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5687,7 +5687,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "simpleaaclip_rect_pdf.png": {
+    "simpleaaclip_rect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5741,7 +5741,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "stroke-fill_pdf.png": {
+    "stroke-fill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5804,7 +5804,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokerects_pdf.png": {
+    "strokerects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5858,7 +5858,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes3_pdf.png": {
+    "strokes3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5903,7 +5903,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes_poly_pdf.png": {
+    "strokes_poly_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5948,7 +5948,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes_round_pdf.png": {
+    "strokes_round_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5993,7 +5993,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tablecolorfilter_pdf.png": {
+    "tablecolorfilter_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6047,7 +6047,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "testimagefilters_pdf.png": {
+    "testimagefilters_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6092,7 +6092,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "texdata_pdf.png": {
+    "texdata_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6137,7 +6137,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "texteffects_pdf.png": {
+    "texteffects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6173,7 +6173,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "thinrects_pdf.png": {
+    "thinrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6209,7 +6209,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "thinstrokedrects_pdf.png": {
+    "thinstrokedrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6263,7 +6263,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tilemodes_pdf.png": {
+    "tilemodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6308,7 +6308,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tinybitmap_pdf.png": {
+    "tinybitmap_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6353,7 +6353,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "twopointconical_pdf.png": {
+    "twopointconical_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6389,7 +6389,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "verttext2_pdf.png": {
+    "verttext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6434,7 +6434,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "verttext_pdf.png": {
+    "verttext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6488,7 +6488,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "xfermodes2_pdf.png": {
+    "xfermodes2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6521,7 +6521,7 @@
         ]
       ]
     }, 
-    "xfermodes3_pdf.png": {
+    "xfermodes3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6574,7 +6574,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "xfermodes_pdf.png": {
+    "xfermodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
index 5ac5602..c9f7b95 100644
--- a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "aarectmodes_pdf.png": {
+    "aarectmodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -155,7 +155,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "arithmode_pdf.png": {
+    "arithmode_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -200,7 +200,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bigmatrix_pdf.png": {
+    "bigmatrix_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -281,7 +281,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmapfilters_pdf.png": {
+    "bitmapfilters_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -326,7 +326,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmapscroll_pdf.png": {
+    "bitmapscroll_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -426,7 +426,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_inner_fast_pdf.png": {
+    "blurrect_25_100_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -462,7 +462,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_inner_slow_pdf.png": {
+    "blurrect_25_100_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -498,7 +498,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_normal_fast_pdf.png": {
+    "blurrect_25_100_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -534,7 +534,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_normal_slow_pdf.png": {
+    "blurrect_25_100_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -570,7 +570,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_outer_fast_pdf.png": {
+    "blurrect_25_100_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -606,7 +606,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_outer_slow_pdf.png": {
+    "blurrect_25_100_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -642,7 +642,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_inner_fast_pdf.png": {
+    "blurrect_25_100_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -678,7 +678,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_inner_slow_pdf.png": {
+    "blurrect_25_100_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -714,7 +714,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_normal_fast_pdf.png": {
+    "blurrect_25_100_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -750,7 +750,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_normal_slow_pdf.png": {
+    "blurrect_25_100_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -786,7 +786,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_outer_fast_pdf.png": {
+    "blurrect_25_100_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -822,7 +822,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_outer_slow_pdf.png": {
+    "blurrect_25_100_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -867,7 +867,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_inner_fast_pdf.png": {
+    "blurrect_5_100_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -903,7 +903,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_inner_slow_pdf.png": {
+    "blurrect_5_100_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -939,7 +939,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_normal_fast_pdf.png": {
+    "blurrect_5_100_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -975,7 +975,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_normal_slow_pdf.png": {
+    "blurrect_5_100_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1011,7 +1011,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_outer_fast_pdf.png": {
+    "blurrect_5_100_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1047,7 +1047,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_outer_slow_pdf.png": {
+    "blurrect_5_100_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1083,7 +1083,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_inner_fast_pdf.png": {
+    "blurrect_5_100_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1119,7 +1119,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_inner_slow_pdf.png": {
+    "blurrect_5_100_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1155,7 +1155,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_normal_fast_pdf.png": {
+    "blurrect_5_100_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1191,7 +1191,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_normal_slow_pdf.png": {
+    "blurrect_5_100_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1227,7 +1227,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_outer_fast_pdf.png": {
+    "blurrect_5_100_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1263,7 +1263,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_outer_slow_pdf.png": {
+    "blurrect_5_100_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1299,7 +1299,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_inner_fast_pdf.png": {
+    "blurrect_5_5_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1335,7 +1335,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_inner_slow_pdf.png": {
+    "blurrect_5_5_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1371,7 +1371,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_normal_fast_pdf.png": {
+    "blurrect_5_5_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1407,7 +1407,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_normal_slow_pdf.png": {
+    "blurrect_5_5_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1443,7 +1443,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_outer_fast_pdf.png": {
+    "blurrect_5_5_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1479,7 +1479,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_outer_slow_pdf.png": {
+    "blurrect_5_5_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1515,7 +1515,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_inner_fast_pdf.png": {
+    "blurrect_5_5_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1551,7 +1551,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_inner_slow_pdf.png": {
+    "blurrect_5_5_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1587,7 +1587,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_normal_fast_pdf.png": {
+    "blurrect_5_5_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1623,7 +1623,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_normal_slow_pdf.png": {
+    "blurrect_5_5_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1659,7 +1659,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_outer_fast_pdf.png": {
+    "blurrect_5_5_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1695,7 +1695,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_outer_slow_pdf.png": {
+    "blurrect_5_5_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1758,7 +1758,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_100_100_10_pdf.png": {
+    "blurrect_slow_100_100_10_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1803,7 +1803,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_100_100_2_pdf.png": {
+    "blurrect_slow_100_100_2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1848,7 +1848,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_10_100_10_pdf.png": {
+    "blurrect_slow_10_100_10_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1893,7 +1893,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_10_10_100_pdf.png": {
+    "blurrect_slow_10_10_100_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1947,7 +1947,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurs_pdf.png": {
+    "blurs_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2019,7 +2019,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "chrome_gradtext2_pdf.png": {
+    "chrome_gradtext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2073,7 +2073,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "circles_pdf.png": {
+    "circles_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2127,7 +2127,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "clamped_gradients_pdf.png": {
+    "clamped_gradients_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2190,7 +2190,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "colorfilterimagefilter_pdf.png": {
+    "colorfilterimagefilter_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2289,7 +2289,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_path_aa_pdf.png": {
+    "complexclip2_path_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2343,7 +2343,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_path_bw_pdf.png": {
+    "complexclip2_path_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2352,7 +2352,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_pdf.png": {
+    "complexclip2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2406,7 +2406,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_rect_aa_pdf.png": {
+    "complexclip2_rect_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2478,7 +2478,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_aa_layer_pdf.png": {
+    "complexclip_aa_layer_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2496,7 +2496,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_aa_pdf.png": {
+    "complexclip_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2568,7 +2568,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_bw_layer_pdf.png": {
+    "complexclip_bw_layer_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2595,7 +2595,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_bw_pdf.png": {
+    "complexclip_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2649,7 +2649,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "convexpaths_pdf.png": {
+    "convexpaths_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2694,7 +2694,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "cubicclosepath_pdf.png": {
+    "cubicclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2730,7 +2730,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "cubicpath_pdf.png": {
+    "cubicpath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2775,7 +2775,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashcubics_pdf.png": {
+    "dashcubics_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2820,7 +2820,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashing2_pdf.png": {
+    "dashing2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2865,7 +2865,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashing3_pdf.png": {
+    "dashing3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2937,7 +2937,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "degeneratesegments_pdf.png": {
+    "degeneratesegments_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3036,7 +3036,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawbitmapmatrix_pdf.png": {
+    "drawbitmapmatrix_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3090,7 +3090,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawbitmaprect_pdf.png": {
+    "drawbitmaprect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3135,7 +3135,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawlooper_pdf.png": {
+    "drawlooper_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3180,7 +3180,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "emptypath_pdf.png": {
+    "emptypath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3225,7 +3225,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filltypes_pdf.png": {
+    "filltypes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3279,7 +3279,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filltypespersp_pdf.png": {
+    "filltypespersp_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3315,7 +3315,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "fontscaler_pdf.png": {
+    "fontscaler_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3369,7 +3369,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gammatext_pdf.png": {
+    "gammatext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3603,7 +3603,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "giantbitmap_repeat_bilerp_scale_pdf.png": {
+    "giantbitmap_repeat_bilerp_scale_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3720,7 +3720,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_degenerate_2pt_pdf.png": {
+    "gradients_degenerate_2pt_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3783,7 +3783,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_local_perspective_pdf.png": {
+    "gradients_local_perspective_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3810,7 +3810,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_pdf.png": {
+    "gradients_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3864,7 +3864,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_view_perspective_pdf.png": {
+    "gradients_view_perspective_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3990,7 +3990,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imageblur_pdf.png": {
+    "imageblur_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4035,7 +4035,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imagefiltersbase_pdf.png": {
+    "imagefiltersbase_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4068,7 +4068,7 @@
         ]
       ]
     }, 
-    "imagefilterscropped_pdf.png": {
+    "imagefilterscropped_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4112,7 +4112,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imagefiltersgraph_pdf.png": {
+    "imagefiltersgraph_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4157,7 +4157,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lcdtext_pdf.png": {
+    "lcdtext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4211,7 +4211,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lighting_pdf.png": {
+    "lighting_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4265,7 +4265,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lineclosepath_pdf.png": {
+    "lineclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4301,7 +4301,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "linepath_pdf.png": {
+    "linepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4355,7 +4355,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "matrixconvolution_pdf.png": {
+    "matrixconvolution_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4418,7 +4418,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "morphology_pdf.png": {
+    "morphology_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4472,7 +4472,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "ninepatch-stretch_pdf.png": {
+    "ninepatch-stretch_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4544,7 +4544,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "ovals_pdf.png": {
+    "ovals_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4598,7 +4598,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "path-reverse_pdf.png": {
+    "path-reverse_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4652,7 +4652,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "patheffect_pdf.png": {
+    "patheffect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4697,7 +4697,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "pathfill_pdf.png": {
+    "pathfill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4751,7 +4751,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "pathinvfill_pdf.png": {
+    "pathinvfill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4814,7 +4814,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "points_pdf.png": {
+    "points_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4859,7 +4859,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "poly2poly_pdf.png": {
+    "poly2poly_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4904,7 +4904,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "quadclosepath_pdf.png": {
+    "quadclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4949,7 +4949,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "quadpath_pdf.png": {
+    "quadpath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5003,7 +5003,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "radial_gradient_pdf.png": {
+    "radial_gradient_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5039,7 +5039,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rects_pdf.png": {
+    "rects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5075,7 +5075,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "roundrects_pdf.png": {
+    "roundrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5138,7 +5138,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_aa_pdf.png": {
+    "rrect_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5183,7 +5183,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_bw_pdf.png": {
+    "rrect_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5228,7 +5228,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_clip_aa_pdf.png": {
+    "rrect_clip_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5273,7 +5273,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_clip_bw_pdf.png": {
+    "rrect_clip_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5300,7 +5300,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_pdf.png": {
+    "rrect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5345,7 +5345,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "samplerstress_pdf.png": {
+    "samplerstress_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5399,7 +5399,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shaderbounds_linear_pdf.png": {
+    "shaderbounds_linear_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5435,7 +5435,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext2_pdf.png": {
+    "shadertext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5480,7 +5480,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext3_pdf.png": {
+    "shadertext3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5534,7 +5534,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext_pdf.png": {
+    "shadertext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5588,7 +5588,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadows_pdf.png": {
+    "shadows_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5633,7 +5633,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "simpleaaclip_path_pdf.png": {
+    "simpleaaclip_path_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5687,7 +5687,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "simpleaaclip_rect_pdf.png": {
+    "simpleaaclip_rect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5741,7 +5741,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "stroke-fill_pdf.png": {
+    "stroke-fill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5804,7 +5804,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokerects_pdf.png": {
+    "strokerects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5858,7 +5858,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes3_pdf.png": {
+    "strokes3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5903,7 +5903,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes_poly_pdf.png": {
+    "strokes_poly_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5948,7 +5948,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes_round_pdf.png": {
+    "strokes_round_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5993,7 +5993,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tablecolorfilter_pdf.png": {
+    "tablecolorfilter_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6047,7 +6047,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "testimagefilters_pdf.png": {
+    "testimagefilters_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6092,7 +6092,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "texdata_pdf.png": {
+    "texdata_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6137,7 +6137,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "texteffects_pdf.png": {
+    "texteffects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6173,7 +6173,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "thinrects_pdf.png": {
+    "thinrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6209,7 +6209,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "thinstrokedrects_pdf.png": {
+    "thinstrokedrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6263,7 +6263,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tilemodes_pdf.png": {
+    "tilemodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6308,7 +6308,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tinybitmap_pdf.png": {
+    "tinybitmap_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6353,7 +6353,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "twopointconical_pdf.png": {
+    "twopointconical_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6389,7 +6389,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "verttext2_pdf.png": {
+    "verttext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6434,7 +6434,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "verttext_pdf.png": {
+    "verttext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6488,7 +6488,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "xfermodes2_pdf.png": {
+    "xfermodes2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6521,7 +6521,7 @@
         ]
       ]
     }, 
-    "xfermodes3_pdf.png": {
+    "xfermodes3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6574,7 +6574,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "xfermodes_pdf.png": {
+    "xfermodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
index 015e03c..1e76b2a 100644
--- a/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "aarectmodes_pdf.png": {
+    "aarectmodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -155,7 +155,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "arithmode_pdf.png": {
+    "arithmode_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -200,7 +200,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bigmatrix_pdf.png": {
+    "bigmatrix_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -281,7 +281,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmapfilters_pdf.png": {
+    "bitmapfilters_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -326,7 +326,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmapscroll_pdf.png": {
+    "bitmapscroll_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -426,7 +426,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_inner_fast_pdf.png": {
+    "blurrect_25_100_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -462,7 +462,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_inner_slow_pdf.png": {
+    "blurrect_25_100_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -498,7 +498,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_normal_fast_pdf.png": {
+    "blurrect_25_100_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -534,7 +534,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_normal_slow_pdf.png": {
+    "blurrect_25_100_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -570,7 +570,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_outer_fast_pdf.png": {
+    "blurrect_25_100_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -606,7 +606,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_outer_slow_pdf.png": {
+    "blurrect_25_100_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -642,7 +642,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_inner_fast_pdf.png": {
+    "blurrect_25_100_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -678,7 +678,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_inner_slow_pdf.png": {
+    "blurrect_25_100_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -714,7 +714,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_normal_fast_pdf.png": {
+    "blurrect_25_100_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -750,7 +750,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_normal_slow_pdf.png": {
+    "blurrect_25_100_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -786,7 +786,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_outer_fast_pdf.png": {
+    "blurrect_25_100_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -822,7 +822,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_outer_slow_pdf.png": {
+    "blurrect_25_100_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -867,7 +867,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_inner_fast_pdf.png": {
+    "blurrect_5_100_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -903,7 +903,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_inner_slow_pdf.png": {
+    "blurrect_5_100_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -939,7 +939,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_normal_fast_pdf.png": {
+    "blurrect_5_100_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -975,7 +975,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_normal_slow_pdf.png": {
+    "blurrect_5_100_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1011,7 +1011,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_outer_fast_pdf.png": {
+    "blurrect_5_100_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1047,7 +1047,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_outer_slow_pdf.png": {
+    "blurrect_5_100_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1083,7 +1083,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_inner_fast_pdf.png": {
+    "blurrect_5_100_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1119,7 +1119,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_inner_slow_pdf.png": {
+    "blurrect_5_100_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1155,7 +1155,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_normal_fast_pdf.png": {
+    "blurrect_5_100_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1191,7 +1191,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_normal_slow_pdf.png": {
+    "blurrect_5_100_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1227,7 +1227,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_outer_fast_pdf.png": {
+    "blurrect_5_100_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1263,7 +1263,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_outer_slow_pdf.png": {
+    "blurrect_5_100_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1299,7 +1299,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_inner_fast_pdf.png": {
+    "blurrect_5_5_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1335,7 +1335,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_inner_slow_pdf.png": {
+    "blurrect_5_5_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1371,7 +1371,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_normal_fast_pdf.png": {
+    "blurrect_5_5_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1407,7 +1407,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_normal_slow_pdf.png": {
+    "blurrect_5_5_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1443,7 +1443,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_outer_fast_pdf.png": {
+    "blurrect_5_5_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1479,7 +1479,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_outer_slow_pdf.png": {
+    "blurrect_5_5_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1515,7 +1515,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_inner_fast_pdf.png": {
+    "blurrect_5_5_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1551,7 +1551,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_inner_slow_pdf.png": {
+    "blurrect_5_5_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1587,7 +1587,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_normal_fast_pdf.png": {
+    "blurrect_5_5_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1623,7 +1623,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_normal_slow_pdf.png": {
+    "blurrect_5_5_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1659,7 +1659,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_outer_fast_pdf.png": {
+    "blurrect_5_5_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1695,7 +1695,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_outer_slow_pdf.png": {
+    "blurrect_5_5_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1758,7 +1758,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_100_100_10_pdf.png": {
+    "blurrect_slow_100_100_10_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1803,7 +1803,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_100_100_2_pdf.png": {
+    "blurrect_slow_100_100_2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1848,7 +1848,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_10_100_10_pdf.png": {
+    "blurrect_slow_10_100_10_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1893,7 +1893,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_10_10_100_pdf.png": {
+    "blurrect_slow_10_10_100_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1947,7 +1947,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurs_pdf.png": {
+    "blurs_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2019,7 +2019,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "chrome_gradtext2_pdf.png": {
+    "chrome_gradtext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2073,7 +2073,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "circles_pdf.png": {
+    "circles_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2127,7 +2127,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "clamped_gradients_pdf.png": {
+    "clamped_gradients_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2190,7 +2190,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "colorfilterimagefilter_pdf.png": {
+    "colorfilterimagefilter_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2289,7 +2289,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_path_aa_pdf.png": {
+    "complexclip2_path_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2343,7 +2343,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_path_bw_pdf.png": {
+    "complexclip2_path_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2352,7 +2352,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_pdf.png": {
+    "complexclip2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2406,7 +2406,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_rect_aa_pdf.png": {
+    "complexclip2_rect_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2478,7 +2478,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_aa_layer_pdf.png": {
+    "complexclip_aa_layer_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2496,7 +2496,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_aa_pdf.png": {
+    "complexclip_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2568,7 +2568,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_bw_layer_pdf.png": {
+    "complexclip_bw_layer_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2595,7 +2595,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_bw_pdf.png": {
+    "complexclip_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2649,7 +2649,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "convexpaths_pdf.png": {
+    "convexpaths_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2694,7 +2694,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "cubicclosepath_pdf.png": {
+    "cubicclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2730,7 +2730,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "cubicpath_pdf.png": {
+    "cubicpath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2775,7 +2775,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashcubics_pdf.png": {
+    "dashcubics_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2820,7 +2820,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashing2_pdf.png": {
+    "dashing2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2865,7 +2865,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashing3_pdf.png": {
+    "dashing3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2937,7 +2937,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "degeneratesegments_pdf.png": {
+    "degeneratesegments_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3036,7 +3036,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawbitmapmatrix_pdf.png": {
+    "drawbitmapmatrix_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3090,7 +3090,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawbitmaprect_pdf.png": {
+    "drawbitmaprect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3135,7 +3135,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawlooper_pdf.png": {
+    "drawlooper_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3180,7 +3180,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "emptypath_pdf.png": {
+    "emptypath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3225,7 +3225,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filltypes_pdf.png": {
+    "filltypes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3279,7 +3279,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filltypespersp_pdf.png": {
+    "filltypespersp_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3315,7 +3315,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "fontscaler_pdf.png": {
+    "fontscaler_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3369,7 +3369,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gammatext_pdf.png": {
+    "gammatext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3603,7 +3603,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "giantbitmap_repeat_bilerp_scale_pdf.png": {
+    "giantbitmap_repeat_bilerp_scale_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3720,7 +3720,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_degenerate_2pt_pdf.png": {
+    "gradients_degenerate_2pt_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3783,7 +3783,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_local_perspective_pdf.png": {
+    "gradients_local_perspective_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3810,7 +3810,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_pdf.png": {
+    "gradients_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3864,7 +3864,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_view_perspective_pdf.png": {
+    "gradients_view_perspective_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3990,7 +3990,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imageblur_pdf.png": {
+    "imageblur_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4035,7 +4035,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imagefiltersbase_pdf.png": {
+    "imagefiltersbase_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4068,7 +4068,7 @@
         ]
       ]
     }, 
-    "imagefilterscropped_pdf.png": {
+    "imagefilterscropped_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4112,7 +4112,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imagefiltersgraph_pdf.png": {
+    "imagefiltersgraph_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4157,7 +4157,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lcdtext_pdf.png": {
+    "lcdtext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4211,7 +4211,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lighting_pdf.png": {
+    "lighting_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4265,7 +4265,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lineclosepath_pdf.png": {
+    "lineclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4301,7 +4301,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "linepath_pdf.png": {
+    "linepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4355,7 +4355,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "matrixconvolution_pdf.png": {
+    "matrixconvolution_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4418,7 +4418,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "morphology_pdf.png": {
+    "morphology_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4472,7 +4472,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "ninepatch-stretch_pdf.png": {
+    "ninepatch-stretch_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4544,7 +4544,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "ovals_pdf.png": {
+    "ovals_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4598,7 +4598,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "path-reverse_pdf.png": {
+    "path-reverse_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4652,7 +4652,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "patheffect_pdf.png": {
+    "patheffect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4697,7 +4697,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "pathfill_pdf.png": {
+    "pathfill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4751,7 +4751,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "pathinvfill_pdf.png": {
+    "pathinvfill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4814,7 +4814,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "points_pdf.png": {
+    "points_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4859,7 +4859,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "poly2poly_pdf.png": {
+    "poly2poly_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4904,7 +4904,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "quadclosepath_pdf.png": {
+    "quadclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4949,7 +4949,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "quadpath_pdf.png": {
+    "quadpath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5003,7 +5003,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "radial_gradient_pdf.png": {
+    "radial_gradient_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5039,7 +5039,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rects_pdf.png": {
+    "rects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5075,7 +5075,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "roundrects_pdf.png": {
+    "roundrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5138,7 +5138,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_aa_pdf.png": {
+    "rrect_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5183,7 +5183,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_bw_pdf.png": {
+    "rrect_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5228,7 +5228,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_clip_aa_pdf.png": {
+    "rrect_clip_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5273,7 +5273,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_clip_bw_pdf.png": {
+    "rrect_clip_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5300,7 +5300,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_pdf.png": {
+    "rrect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5345,7 +5345,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "samplerstress_pdf.png": {
+    "samplerstress_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5399,7 +5399,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shaderbounds_linear_pdf.png": {
+    "shaderbounds_linear_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5435,7 +5435,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext2_pdf.png": {
+    "shadertext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5480,7 +5480,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext3_pdf.png": {
+    "shadertext3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5534,7 +5534,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext_pdf.png": {
+    "shadertext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5588,7 +5588,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadows_pdf.png": {
+    "shadows_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5633,7 +5633,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "simpleaaclip_path_pdf.png": {
+    "simpleaaclip_path_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5687,7 +5687,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "simpleaaclip_rect_pdf.png": {
+    "simpleaaclip_rect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5741,7 +5741,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "stroke-fill_pdf.png": {
+    "stroke-fill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5804,7 +5804,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokerects_pdf.png": {
+    "strokerects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5858,7 +5858,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes3_pdf.png": {
+    "strokes3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5903,7 +5903,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes_poly_pdf.png": {
+    "strokes_poly_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5948,7 +5948,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes_round_pdf.png": {
+    "strokes_round_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5993,7 +5993,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tablecolorfilter_pdf.png": {
+    "tablecolorfilter_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6047,7 +6047,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "testimagefilters_pdf.png": {
+    "testimagefilters_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6092,7 +6092,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "texdata_pdf.png": {
+    "texdata_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6137,7 +6137,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "texteffects_pdf.png": {
+    "texteffects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6173,7 +6173,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "thinrects_pdf.png": {
+    "thinrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6209,7 +6209,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "thinstrokedrects_pdf.png": {
+    "thinstrokedrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6263,7 +6263,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tilemodes_pdf.png": {
+    "tilemodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6308,7 +6308,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tinybitmap_pdf.png": {
+    "tinybitmap_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6353,7 +6353,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "twopointconical_pdf.png": {
+    "twopointconical_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6389,7 +6389,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "verttext2_pdf.png": {
+    "verttext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6434,7 +6434,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "verttext_pdf.png": {
+    "verttext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6488,7 +6488,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "xfermodes2_pdf.png": {
+    "xfermodes2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6521,7 +6521,7 @@
         ]
       ]
     }, 
-    "xfermodes3_pdf.png": {
+    "xfermodes3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6574,7 +6574,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "xfermodes_pdf.png": {
+    "xfermodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug/expected-results.json b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
index 6c56048..175f7cc 100644
--- a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "aarectmodes_pdf.png": {
+    "aarectmodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -155,7 +155,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "arithmode_pdf.png": {
+    "arithmode_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -209,7 +209,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bigmatrix_pdf.png": {
+    "bigmatrix_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -263,7 +263,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmapcopy_pdf.png": {
+    "bitmapcopy_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -317,7 +317,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmapfilters_pdf.png": {
+    "bitmapfilters_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -371,7 +371,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmapscroll_pdf.png": {
+    "bitmapscroll_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -480,7 +480,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_inner_fast_pdf.png": {
+    "blurrect_25_100_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -525,7 +525,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_inner_slow_pdf.png": {
+    "blurrect_25_100_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -570,7 +570,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_normal_fast_pdf.png": {
+    "blurrect_25_100_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -615,7 +615,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_normal_slow_pdf.png": {
+    "blurrect_25_100_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -660,7 +660,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_outer_fast_pdf.png": {
+    "blurrect_25_100_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -705,7 +705,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_outer_slow_pdf.png": {
+    "blurrect_25_100_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -750,7 +750,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_inner_fast_pdf.png": {
+    "blurrect_25_100_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -795,7 +795,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_inner_slow_pdf.png": {
+    "blurrect_25_100_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -840,7 +840,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_normal_fast_pdf.png": {
+    "blurrect_25_100_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -885,7 +885,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_normal_slow_pdf.png": {
+    "blurrect_25_100_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -930,7 +930,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_outer_fast_pdf.png": {
+    "blurrect_25_100_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -975,7 +975,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_outer_slow_pdf.png": {
+    "blurrect_25_100_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1029,7 +1029,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_inner_fast_pdf.png": {
+    "blurrect_5_100_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1074,7 +1074,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_inner_slow_pdf.png": {
+    "blurrect_5_100_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1119,7 +1119,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_normal_fast_pdf.png": {
+    "blurrect_5_100_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1164,7 +1164,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_normal_slow_pdf.png": {
+    "blurrect_5_100_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1209,7 +1209,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_outer_fast_pdf.png": {
+    "blurrect_5_100_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1254,7 +1254,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_outer_slow_pdf.png": {
+    "blurrect_5_100_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1299,7 +1299,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_inner_fast_pdf.png": {
+    "blurrect_5_100_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1344,7 +1344,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_inner_slow_pdf.png": {
+    "blurrect_5_100_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1389,7 +1389,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_normal_fast_pdf.png": {
+    "blurrect_5_100_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1434,7 +1434,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_normal_slow_pdf.png": {
+    "blurrect_5_100_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1479,7 +1479,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_outer_fast_pdf.png": {
+    "blurrect_5_100_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1524,7 +1524,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_outer_slow_pdf.png": {
+    "blurrect_5_100_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1569,7 +1569,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_inner_fast_pdf.png": {
+    "blurrect_5_5_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1614,7 +1614,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_inner_slow_pdf.png": {
+    "blurrect_5_5_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1659,7 +1659,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_normal_fast_pdf.png": {
+    "blurrect_5_5_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1704,7 +1704,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_normal_slow_pdf.png": {
+    "blurrect_5_5_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1749,7 +1749,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_outer_fast_pdf.png": {
+    "blurrect_5_5_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1794,7 +1794,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_outer_slow_pdf.png": {
+    "blurrect_5_5_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1839,7 +1839,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_inner_fast_pdf.png": {
+    "blurrect_5_5_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1884,7 +1884,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_inner_slow_pdf.png": {
+    "blurrect_5_5_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1929,7 +1929,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_normal_fast_pdf.png": {
+    "blurrect_5_5_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1974,7 +1974,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_normal_slow_pdf.png": {
+    "blurrect_5_5_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2019,7 +2019,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_outer_fast_pdf.png": {
+    "blurrect_5_5_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2064,7 +2064,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_outer_slow_pdf.png": {
+    "blurrect_5_5_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2127,7 +2127,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_100_100_10_pdf.png": {
+    "blurrect_slow_100_100_10_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2172,7 +2172,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_100_100_2_pdf.png": {
+    "blurrect_slow_100_100_2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2217,7 +2217,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_10_100_10_pdf.png": {
+    "blurrect_slow_10_100_10_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2244,7 +2244,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_10_10_100_pdf.png": {
+    "blurrect_slow_10_10_100_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2298,7 +2298,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurs_pdf.png": {
+    "blurs_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2370,7 +2370,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "chrome_gradtext2_pdf.png": {
+    "chrome_gradtext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2424,7 +2424,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "circles_pdf.png": {
+    "circles_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2478,7 +2478,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "clamped_gradients_pdf.png": {
+    "clamped_gradients_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2541,7 +2541,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "colorfilterimagefilter_pdf.png": {
+    "colorfilterimagefilter_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2640,7 +2640,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_path_aa_pdf.png": {
+    "complexclip2_path_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2694,7 +2694,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_path_bw_pdf.png": {
+    "complexclip2_path_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2703,7 +2703,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_pdf.png": {
+    "complexclip2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2757,7 +2757,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_rect_aa_pdf.png": {
+    "complexclip2_rect_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2829,7 +2829,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_aa_layer_pdf.png": {
+    "complexclip_aa_layer_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2856,7 +2856,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_aa_pdf.png": {
+    "complexclip_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2928,7 +2928,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_bw_layer_pdf.png": {
+    "complexclip_bw_layer_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2955,7 +2955,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_bw_pdf.png": {
+    "complexclip_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3009,7 +3009,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "convexpaths_pdf.png": {
+    "convexpaths_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3063,7 +3063,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "cubicclosepath_pdf.png": {
+    "cubicclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3108,7 +3108,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "cubicpath_pdf.png": {
+    "cubicpath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3153,7 +3153,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashcubics_pdf.png": {
+    "dashcubics_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3198,7 +3198,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashing2_pdf.png": {
+    "dashing2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3243,7 +3243,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashing3_pdf.png": {
+    "dashing3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3297,7 +3297,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "degeneratesegments_pdf.png": {
+    "degeneratesegments_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3405,7 +3405,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawbitmapmatrix_pdf.png": {
+    "drawbitmapmatrix_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3450,7 +3450,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawbitmaprect_pdf.png": {
+    "drawbitmaprect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3495,7 +3495,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawlooper_pdf.png": {
+    "drawlooper_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3549,7 +3549,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "emptypath_pdf.png": {
+    "emptypath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3594,7 +3594,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filltypes_pdf.png": {
+    "filltypes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3648,7 +3648,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filltypespersp_pdf.png": {
+    "filltypespersp_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3693,7 +3693,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "fontscaler_pdf.png": {
+    "fontscaler_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3747,7 +3747,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gammatext_pdf.png": {
+    "gammatext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3981,7 +3981,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "giantbitmap_repeat_bilerp_scale_pdf.png": {
+    "giantbitmap_repeat_bilerp_scale_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4098,7 +4098,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_degenerate_2pt_pdf.png": {
+    "gradients_degenerate_2pt_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4161,7 +4161,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_local_perspective_pdf.png": {
+    "gradients_local_perspective_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4188,7 +4188,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_pdf.png": {
+    "gradients_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4242,7 +4242,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_view_perspective_pdf.png": {
+    "gradients_view_perspective_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4296,7 +4296,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradtext_pdf.png": {
+    "gradtext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4395,7 +4395,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imageblur_pdf.png": {
+    "imageblur_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4440,7 +4440,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imagefiltersbase_pdf.png": {
+    "imagefiltersbase_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4481,7 +4481,7 @@
         ]
       ]
     }, 
-    "imagefilterscropped_pdf.png": {
+    "imagefilterscropped_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4525,7 +4525,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imagefiltersgraph_pdf.png": {
+    "imagefiltersgraph_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4579,7 +4579,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lcdtext_pdf.png": {
+    "lcdtext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4633,7 +4633,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lighting_pdf.png": {
+    "lighting_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4687,7 +4687,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lineclosepath_pdf.png": {
+    "lineclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4732,7 +4732,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "linepath_pdf.png": {
+    "linepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4777,7 +4777,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "matrixconvolution_pdf.png": {
+    "matrixconvolution_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4858,7 +4858,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "morphology_pdf.png": {
+    "morphology_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4912,7 +4912,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "ninepatch-stretch_pdf.png": {
+    "ninepatch-stretch_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4993,7 +4993,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "ovals_pdf.png": {
+    "ovals_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5047,7 +5047,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "path-reverse_pdf.png": {
+    "path-reverse_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5101,7 +5101,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "patheffect_pdf.png": {
+    "patheffect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5146,7 +5146,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "pathfill_pdf.png": {
+    "pathfill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5200,7 +5200,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "pathinvfill_pdf.png": {
+    "pathinvfill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5263,7 +5263,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "points_pdf.png": {
+    "points_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5308,7 +5308,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "poly2poly_pdf.png": {
+    "poly2poly_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5362,7 +5362,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "quadclosepath_pdf.png": {
+    "quadclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5407,7 +5407,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "quadpath_pdf.png": {
+    "quadpath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5461,7 +5461,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "radial_gradient_pdf.png": {
+    "radial_gradient_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5506,7 +5506,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rects_pdf.png": {
+    "rects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5551,7 +5551,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "roundrects_pdf.png": {
+    "roundrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5614,7 +5614,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_aa_pdf.png": {
+    "rrect_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5659,7 +5659,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_bw_pdf.png": {
+    "rrect_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5704,7 +5704,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_clip_aa_pdf.png": {
+    "rrect_clip_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5749,7 +5749,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_clip_bw_pdf.png": {
+    "rrect_clip_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5776,7 +5776,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_pdf.png": {
+    "rrect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5821,7 +5821,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "samplerstress_pdf.png": {
+    "samplerstress_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5875,7 +5875,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shaderbounds_linear_pdf.png": {
+    "shaderbounds_linear_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5911,7 +5911,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext2_pdf.png": {
+    "shadertext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5956,7 +5956,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext3_pdf.png": {
+    "shadertext3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6010,7 +6010,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext_pdf.png": {
+    "shadertext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6064,7 +6064,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadows_pdf.png": {
+    "shadows_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6118,7 +6118,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "simpleaaclip_path_pdf.png": {
+    "simpleaaclip_path_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6172,7 +6172,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "simpleaaclip_rect_pdf.png": {
+    "simpleaaclip_rect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6226,7 +6226,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "stroke-fill_pdf.png": {
+    "stroke-fill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6298,7 +6298,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokerects_pdf.png": {
+    "strokerects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6352,7 +6352,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes3_pdf.png": {
+    "strokes3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6397,7 +6397,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes_poly_pdf.png": {
+    "strokes_poly_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6442,7 +6442,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes_round_pdf.png": {
+    "strokes_round_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6487,7 +6487,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tablecolorfilter_pdf.png": {
+    "tablecolorfilter_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6541,7 +6541,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "testimagefilters_pdf.png": {
+    "testimagefilters_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6622,7 +6622,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "texteffects_pdf.png": {
+    "texteffects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6667,7 +6667,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "thinrects_pdf.png": {
+    "thinrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6712,7 +6712,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "thinstrokedrects_pdf.png": {
+    "thinstrokedrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6766,7 +6766,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tilemodes_pdf.png": {
+    "tilemodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6856,7 +6856,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "twopointconical_pdf.png": {
+    "twopointconical_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6901,7 +6901,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "verttext2_pdf.png": {
+    "verttext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6946,7 +6946,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "verttext_pdf.png": {
+    "verttext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7027,7 +7027,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "xfermodes2_pdf.png": {
+    "xfermodes2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7060,7 +7060,7 @@
         ]
       ]
     }, 
-    "xfermodes3_pdf.png": {
+    "xfermodes3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7113,7 +7113,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "xfermodes_pdf.png": {
+    "xfermodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/expected-results.json b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/expected-results.json
index 6e83725..89e15e3 100644
--- a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/expected-results.json
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "aarectmodes_pdf.png": {
+    "aarectmodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -155,7 +155,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "arithmode_pdf.png": {
+    "arithmode_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -209,7 +209,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bigmatrix_pdf.png": {
+    "bigmatrix_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -263,7 +263,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmapcopy_pdf.png": {
+    "bitmapcopy_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -317,7 +317,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmapfilters_pdf.png": {
+    "bitmapfilters_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -371,7 +371,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmapscroll_pdf.png": {
+    "bitmapscroll_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -480,7 +480,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_inner_fast_pdf.png": {
+    "blurrect_25_100_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -525,7 +525,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_inner_slow_pdf.png": {
+    "blurrect_25_100_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -570,7 +570,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_normal_fast_pdf.png": {
+    "blurrect_25_100_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -615,7 +615,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_normal_slow_pdf.png": {
+    "blurrect_25_100_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -660,7 +660,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_outer_fast_pdf.png": {
+    "blurrect_25_100_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -705,7 +705,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_outer_slow_pdf.png": {
+    "blurrect_25_100_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -750,7 +750,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_inner_fast_pdf.png": {
+    "blurrect_25_100_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -795,7 +795,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_inner_slow_pdf.png": {
+    "blurrect_25_100_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -840,7 +840,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_normal_fast_pdf.png": {
+    "blurrect_25_100_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -885,7 +885,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_normal_slow_pdf.png": {
+    "blurrect_25_100_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -930,7 +930,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_outer_fast_pdf.png": {
+    "blurrect_25_100_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -975,7 +975,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_outer_slow_pdf.png": {
+    "blurrect_25_100_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1029,7 +1029,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_inner_fast_pdf.png": {
+    "blurrect_5_100_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1074,7 +1074,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_inner_slow_pdf.png": {
+    "blurrect_5_100_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1119,7 +1119,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_normal_fast_pdf.png": {
+    "blurrect_5_100_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1164,7 +1164,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_normal_slow_pdf.png": {
+    "blurrect_5_100_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1209,7 +1209,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_outer_fast_pdf.png": {
+    "blurrect_5_100_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1254,7 +1254,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_outer_slow_pdf.png": {
+    "blurrect_5_100_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1299,7 +1299,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_inner_fast_pdf.png": {
+    "blurrect_5_100_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1344,7 +1344,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_inner_slow_pdf.png": {
+    "blurrect_5_100_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1389,7 +1389,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_normal_fast_pdf.png": {
+    "blurrect_5_100_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1434,7 +1434,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_normal_slow_pdf.png": {
+    "blurrect_5_100_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1479,7 +1479,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_outer_fast_pdf.png": {
+    "blurrect_5_100_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1524,7 +1524,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_outer_slow_pdf.png": {
+    "blurrect_5_100_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1569,7 +1569,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_inner_fast_pdf.png": {
+    "blurrect_5_5_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1614,7 +1614,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_inner_slow_pdf.png": {
+    "blurrect_5_5_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1659,7 +1659,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_normal_fast_pdf.png": {
+    "blurrect_5_5_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1704,7 +1704,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_normal_slow_pdf.png": {
+    "blurrect_5_5_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1749,7 +1749,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_outer_fast_pdf.png": {
+    "blurrect_5_5_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1794,7 +1794,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_outer_slow_pdf.png": {
+    "blurrect_5_5_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1839,7 +1839,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_inner_fast_pdf.png": {
+    "blurrect_5_5_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1884,7 +1884,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_inner_slow_pdf.png": {
+    "blurrect_5_5_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1929,7 +1929,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_normal_fast_pdf.png": {
+    "blurrect_5_5_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1974,7 +1974,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_normal_slow_pdf.png": {
+    "blurrect_5_5_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2019,7 +2019,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_outer_fast_pdf.png": {
+    "blurrect_5_5_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2064,7 +2064,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_outer_slow_pdf.png": {
+    "blurrect_5_5_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2127,7 +2127,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_100_100_10_pdf.png": {
+    "blurrect_slow_100_100_10_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2172,7 +2172,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_100_100_2_pdf.png": {
+    "blurrect_slow_100_100_2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2217,7 +2217,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_10_100_10_pdf.png": {
+    "blurrect_slow_10_100_10_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2244,7 +2244,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_10_10_100_pdf.png": {
+    "blurrect_slow_10_10_100_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2298,7 +2298,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurs_pdf.png": {
+    "blurs_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2370,7 +2370,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "chrome_gradtext2_pdf.png": {
+    "chrome_gradtext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2424,7 +2424,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "circles_pdf.png": {
+    "circles_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2478,7 +2478,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "clamped_gradients_pdf.png": {
+    "clamped_gradients_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2541,7 +2541,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "colorfilterimagefilter_pdf.png": {
+    "colorfilterimagefilter_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2640,7 +2640,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_path_aa_pdf.png": {
+    "complexclip2_path_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2694,7 +2694,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_path_bw_pdf.png": {
+    "complexclip2_path_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2703,7 +2703,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_pdf.png": {
+    "complexclip2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2757,7 +2757,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_rect_aa_pdf.png": {
+    "complexclip2_rect_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2829,7 +2829,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_aa_layer_pdf.png": {
+    "complexclip_aa_layer_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2856,7 +2856,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_aa_pdf.png": {
+    "complexclip_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2928,7 +2928,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_bw_layer_pdf.png": {
+    "complexclip_bw_layer_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2955,7 +2955,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_bw_pdf.png": {
+    "complexclip_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3009,7 +3009,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "convexpaths_pdf.png": {
+    "convexpaths_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3063,7 +3063,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "cubicclosepath_pdf.png": {
+    "cubicclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3108,7 +3108,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "cubicpath_pdf.png": {
+    "cubicpath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3153,7 +3153,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashcubics_pdf.png": {
+    "dashcubics_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3198,7 +3198,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashing2_pdf.png": {
+    "dashing2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3243,7 +3243,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashing3_pdf.png": {
+    "dashing3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3297,7 +3297,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "degeneratesegments_pdf.png": {
+    "degeneratesegments_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3405,7 +3405,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawbitmapmatrix_pdf.png": {
+    "drawbitmapmatrix_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3450,7 +3450,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawbitmaprect_pdf.png": {
+    "drawbitmaprect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3495,7 +3495,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawlooper_pdf.png": {
+    "drawlooper_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3549,7 +3549,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "emptypath_pdf.png": {
+    "emptypath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3594,7 +3594,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filltypes_pdf.png": {
+    "filltypes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3648,7 +3648,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filltypespersp_pdf.png": {
+    "filltypespersp_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3693,7 +3693,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "fontscaler_pdf.png": {
+    "fontscaler_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3747,7 +3747,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gammatext_pdf.png": {
+    "gammatext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3981,7 +3981,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "giantbitmap_repeat_bilerp_scale_pdf.png": {
+    "giantbitmap_repeat_bilerp_scale_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4098,7 +4098,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_degenerate_2pt_pdf.png": {
+    "gradients_degenerate_2pt_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4161,7 +4161,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_local_perspective_pdf.png": {
+    "gradients_local_perspective_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4188,7 +4188,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_pdf.png": {
+    "gradients_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4242,7 +4242,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_view_perspective_pdf.png": {
+    "gradients_view_perspective_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4296,7 +4296,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradtext_pdf.png": {
+    "gradtext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4395,7 +4395,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imageblur_pdf.png": {
+    "imageblur_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4440,7 +4440,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imagefiltersbase_pdf.png": {
+    "imagefiltersbase_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4481,7 +4481,7 @@
         ]
       ]
     }, 
-    "imagefilterscropped_pdf.png": {
+    "imagefilterscropped_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4525,7 +4525,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imagefiltersgraph_pdf.png": {
+    "imagefiltersgraph_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4579,7 +4579,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lcdtext_pdf.png": {
+    "lcdtext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4633,7 +4633,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lighting_pdf.png": {
+    "lighting_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4687,7 +4687,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lineclosepath_pdf.png": {
+    "lineclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4732,7 +4732,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "linepath_pdf.png": {
+    "linepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4777,7 +4777,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "matrixconvolution_pdf.png": {
+    "matrixconvolution_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4858,7 +4858,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "morphology_pdf.png": {
+    "morphology_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4912,7 +4912,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "ninepatch-stretch_pdf.png": {
+    "ninepatch-stretch_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4993,7 +4993,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "ovals_pdf.png": {
+    "ovals_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5047,7 +5047,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "path-reverse_pdf.png": {
+    "path-reverse_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5101,7 +5101,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "patheffect_pdf.png": {
+    "patheffect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5146,7 +5146,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "pathfill_pdf.png": {
+    "pathfill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5200,7 +5200,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "pathinvfill_pdf.png": {
+    "pathinvfill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5263,7 +5263,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "points_pdf.png": {
+    "points_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5308,7 +5308,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "poly2poly_pdf.png": {
+    "poly2poly_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5362,7 +5362,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "quadclosepath_pdf.png": {
+    "quadclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5407,7 +5407,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "quadpath_pdf.png": {
+    "quadpath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5461,7 +5461,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "radial_gradient_pdf.png": {
+    "radial_gradient_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5506,7 +5506,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rects_pdf.png": {
+    "rects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5551,7 +5551,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "roundrects_pdf.png": {
+    "roundrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5614,7 +5614,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_aa_pdf.png": {
+    "rrect_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5659,7 +5659,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_bw_pdf.png": {
+    "rrect_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5704,7 +5704,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_clip_aa_pdf.png": {
+    "rrect_clip_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5749,7 +5749,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_clip_bw_pdf.png": {
+    "rrect_clip_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5776,7 +5776,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_pdf.png": {
+    "rrect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5821,7 +5821,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "samplerstress_pdf.png": {
+    "samplerstress_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5875,7 +5875,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shaderbounds_linear_pdf.png": {
+    "shaderbounds_linear_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5911,7 +5911,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext2_pdf.png": {
+    "shadertext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5956,7 +5956,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext3_pdf.png": {
+    "shadertext3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6010,7 +6010,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext_pdf.png": {
+    "shadertext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6064,7 +6064,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadows_pdf.png": {
+    "shadows_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6118,7 +6118,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "simpleaaclip_path_pdf.png": {
+    "simpleaaclip_path_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6172,7 +6172,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "simpleaaclip_rect_pdf.png": {
+    "simpleaaclip_rect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6226,7 +6226,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "stroke-fill_pdf.png": {
+    "stroke-fill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6298,7 +6298,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokerects_pdf.png": {
+    "strokerects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6352,7 +6352,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes3_pdf.png": {
+    "strokes3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6397,7 +6397,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes_poly_pdf.png": {
+    "strokes_poly_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6442,7 +6442,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes_round_pdf.png": {
+    "strokes_round_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6487,7 +6487,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tablecolorfilter_pdf.png": {
+    "tablecolorfilter_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6541,7 +6541,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "testimagefilters_pdf.png": {
+    "testimagefilters_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6622,7 +6622,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "texteffects_pdf.png": {
+    "texteffects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6667,7 +6667,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "thinrects_pdf.png": {
+    "thinrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6712,7 +6712,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "thinstrokedrects_pdf.png": {
+    "thinstrokedrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6766,7 +6766,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tilemodes_pdf.png": {
+    "tilemodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6856,7 +6856,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "twopointconical_pdf.png": {
+    "twopointconical_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6901,7 +6901,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "verttext2_pdf.png": {
+    "verttext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6946,7 +6946,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "verttext_pdf.png": {
+    "verttext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7027,7 +7027,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "xfermodes2_pdf.png": {
+    "xfermodes2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7060,7 +7060,7 @@
         ]
       ]
     }, 
-    "xfermodes3_pdf.png": {
+    "xfermodes3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7113,7 +7113,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "xfermodes_pdf.png": {
+    "xfermodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
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 6c56048..175f7cc 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
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "aarectmodes_pdf.png": {
+    "aarectmodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -155,7 +155,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "arithmode_pdf.png": {
+    "arithmode_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -209,7 +209,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bigmatrix_pdf.png": {
+    "bigmatrix_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -263,7 +263,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmapcopy_pdf.png": {
+    "bitmapcopy_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -317,7 +317,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmapfilters_pdf.png": {
+    "bitmapfilters_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -371,7 +371,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmapscroll_pdf.png": {
+    "bitmapscroll_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -480,7 +480,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_inner_fast_pdf.png": {
+    "blurrect_25_100_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -525,7 +525,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_inner_slow_pdf.png": {
+    "blurrect_25_100_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -570,7 +570,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_normal_fast_pdf.png": {
+    "blurrect_25_100_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -615,7 +615,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_normal_slow_pdf.png": {
+    "blurrect_25_100_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -660,7 +660,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_outer_fast_pdf.png": {
+    "blurrect_25_100_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -705,7 +705,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_outer_slow_pdf.png": {
+    "blurrect_25_100_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -750,7 +750,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_inner_fast_pdf.png": {
+    "blurrect_25_100_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -795,7 +795,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_inner_slow_pdf.png": {
+    "blurrect_25_100_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -840,7 +840,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_normal_fast_pdf.png": {
+    "blurrect_25_100_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -885,7 +885,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_normal_slow_pdf.png": {
+    "blurrect_25_100_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -930,7 +930,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_outer_fast_pdf.png": {
+    "blurrect_25_100_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -975,7 +975,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_outer_slow_pdf.png": {
+    "blurrect_25_100_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1029,7 +1029,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_inner_fast_pdf.png": {
+    "blurrect_5_100_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1074,7 +1074,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_inner_slow_pdf.png": {
+    "blurrect_5_100_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1119,7 +1119,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_normal_fast_pdf.png": {
+    "blurrect_5_100_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1164,7 +1164,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_normal_slow_pdf.png": {
+    "blurrect_5_100_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1209,7 +1209,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_outer_fast_pdf.png": {
+    "blurrect_5_100_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1254,7 +1254,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_outer_slow_pdf.png": {
+    "blurrect_5_100_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1299,7 +1299,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_inner_fast_pdf.png": {
+    "blurrect_5_100_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1344,7 +1344,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_inner_slow_pdf.png": {
+    "blurrect_5_100_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1389,7 +1389,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_normal_fast_pdf.png": {
+    "blurrect_5_100_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1434,7 +1434,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_normal_slow_pdf.png": {
+    "blurrect_5_100_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1479,7 +1479,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_outer_fast_pdf.png": {
+    "blurrect_5_100_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1524,7 +1524,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_outer_slow_pdf.png": {
+    "blurrect_5_100_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1569,7 +1569,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_inner_fast_pdf.png": {
+    "blurrect_5_5_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1614,7 +1614,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_inner_slow_pdf.png": {
+    "blurrect_5_5_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1659,7 +1659,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_normal_fast_pdf.png": {
+    "blurrect_5_5_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1704,7 +1704,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_normal_slow_pdf.png": {
+    "blurrect_5_5_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1749,7 +1749,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_outer_fast_pdf.png": {
+    "blurrect_5_5_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1794,7 +1794,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_outer_slow_pdf.png": {
+    "blurrect_5_5_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1839,7 +1839,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_inner_fast_pdf.png": {
+    "blurrect_5_5_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1884,7 +1884,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_inner_slow_pdf.png": {
+    "blurrect_5_5_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1929,7 +1929,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_normal_fast_pdf.png": {
+    "blurrect_5_5_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1974,7 +1974,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_normal_slow_pdf.png": {
+    "blurrect_5_5_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2019,7 +2019,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_outer_fast_pdf.png": {
+    "blurrect_5_5_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2064,7 +2064,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_outer_slow_pdf.png": {
+    "blurrect_5_5_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2127,7 +2127,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_100_100_10_pdf.png": {
+    "blurrect_slow_100_100_10_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2172,7 +2172,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_100_100_2_pdf.png": {
+    "blurrect_slow_100_100_2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2217,7 +2217,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_10_100_10_pdf.png": {
+    "blurrect_slow_10_100_10_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2244,7 +2244,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_10_10_100_pdf.png": {
+    "blurrect_slow_10_10_100_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2298,7 +2298,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurs_pdf.png": {
+    "blurs_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2370,7 +2370,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "chrome_gradtext2_pdf.png": {
+    "chrome_gradtext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2424,7 +2424,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "circles_pdf.png": {
+    "circles_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2478,7 +2478,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "clamped_gradients_pdf.png": {
+    "clamped_gradients_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2541,7 +2541,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "colorfilterimagefilter_pdf.png": {
+    "colorfilterimagefilter_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2640,7 +2640,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_path_aa_pdf.png": {
+    "complexclip2_path_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2694,7 +2694,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_path_bw_pdf.png": {
+    "complexclip2_path_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2703,7 +2703,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_pdf.png": {
+    "complexclip2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2757,7 +2757,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_rect_aa_pdf.png": {
+    "complexclip2_rect_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2829,7 +2829,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_aa_layer_pdf.png": {
+    "complexclip_aa_layer_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2856,7 +2856,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_aa_pdf.png": {
+    "complexclip_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2928,7 +2928,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_bw_layer_pdf.png": {
+    "complexclip_bw_layer_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2955,7 +2955,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_bw_pdf.png": {
+    "complexclip_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3009,7 +3009,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "convexpaths_pdf.png": {
+    "convexpaths_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3063,7 +3063,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "cubicclosepath_pdf.png": {
+    "cubicclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3108,7 +3108,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "cubicpath_pdf.png": {
+    "cubicpath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3153,7 +3153,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashcubics_pdf.png": {
+    "dashcubics_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3198,7 +3198,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashing2_pdf.png": {
+    "dashing2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3243,7 +3243,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashing3_pdf.png": {
+    "dashing3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3297,7 +3297,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "degeneratesegments_pdf.png": {
+    "degeneratesegments_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3405,7 +3405,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawbitmapmatrix_pdf.png": {
+    "drawbitmapmatrix_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3450,7 +3450,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawbitmaprect_pdf.png": {
+    "drawbitmaprect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3495,7 +3495,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawlooper_pdf.png": {
+    "drawlooper_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3549,7 +3549,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "emptypath_pdf.png": {
+    "emptypath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3594,7 +3594,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filltypes_pdf.png": {
+    "filltypes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3648,7 +3648,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filltypespersp_pdf.png": {
+    "filltypespersp_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3693,7 +3693,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "fontscaler_pdf.png": {
+    "fontscaler_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3747,7 +3747,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gammatext_pdf.png": {
+    "gammatext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3981,7 +3981,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "giantbitmap_repeat_bilerp_scale_pdf.png": {
+    "giantbitmap_repeat_bilerp_scale_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4098,7 +4098,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_degenerate_2pt_pdf.png": {
+    "gradients_degenerate_2pt_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4161,7 +4161,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_local_perspective_pdf.png": {
+    "gradients_local_perspective_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4188,7 +4188,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_pdf.png": {
+    "gradients_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4242,7 +4242,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_view_perspective_pdf.png": {
+    "gradients_view_perspective_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4296,7 +4296,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradtext_pdf.png": {
+    "gradtext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4395,7 +4395,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imageblur_pdf.png": {
+    "imageblur_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4440,7 +4440,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imagefiltersbase_pdf.png": {
+    "imagefiltersbase_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4481,7 +4481,7 @@
         ]
       ]
     }, 
-    "imagefilterscropped_pdf.png": {
+    "imagefilterscropped_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4525,7 +4525,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imagefiltersgraph_pdf.png": {
+    "imagefiltersgraph_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4579,7 +4579,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lcdtext_pdf.png": {
+    "lcdtext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4633,7 +4633,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lighting_pdf.png": {
+    "lighting_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4687,7 +4687,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lineclosepath_pdf.png": {
+    "lineclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4732,7 +4732,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "linepath_pdf.png": {
+    "linepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4777,7 +4777,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "matrixconvolution_pdf.png": {
+    "matrixconvolution_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4858,7 +4858,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "morphology_pdf.png": {
+    "morphology_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4912,7 +4912,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "ninepatch-stretch_pdf.png": {
+    "ninepatch-stretch_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4993,7 +4993,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "ovals_pdf.png": {
+    "ovals_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5047,7 +5047,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "path-reverse_pdf.png": {
+    "path-reverse_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5101,7 +5101,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "patheffect_pdf.png": {
+    "patheffect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5146,7 +5146,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "pathfill_pdf.png": {
+    "pathfill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5200,7 +5200,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "pathinvfill_pdf.png": {
+    "pathinvfill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5263,7 +5263,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "points_pdf.png": {
+    "points_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5308,7 +5308,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "poly2poly_pdf.png": {
+    "poly2poly_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5362,7 +5362,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "quadclosepath_pdf.png": {
+    "quadclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5407,7 +5407,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "quadpath_pdf.png": {
+    "quadpath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5461,7 +5461,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "radial_gradient_pdf.png": {
+    "radial_gradient_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5506,7 +5506,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rects_pdf.png": {
+    "rects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5551,7 +5551,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "roundrects_pdf.png": {
+    "roundrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5614,7 +5614,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_aa_pdf.png": {
+    "rrect_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5659,7 +5659,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_bw_pdf.png": {
+    "rrect_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5704,7 +5704,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_clip_aa_pdf.png": {
+    "rrect_clip_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5749,7 +5749,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_clip_bw_pdf.png": {
+    "rrect_clip_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5776,7 +5776,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_pdf.png": {
+    "rrect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5821,7 +5821,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "samplerstress_pdf.png": {
+    "samplerstress_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5875,7 +5875,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shaderbounds_linear_pdf.png": {
+    "shaderbounds_linear_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5911,7 +5911,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext2_pdf.png": {
+    "shadertext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5956,7 +5956,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext3_pdf.png": {
+    "shadertext3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6010,7 +6010,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext_pdf.png": {
+    "shadertext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6064,7 +6064,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadows_pdf.png": {
+    "shadows_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6118,7 +6118,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "simpleaaclip_path_pdf.png": {
+    "simpleaaclip_path_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6172,7 +6172,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "simpleaaclip_rect_pdf.png": {
+    "simpleaaclip_rect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6226,7 +6226,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "stroke-fill_pdf.png": {
+    "stroke-fill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6298,7 +6298,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokerects_pdf.png": {
+    "strokerects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6352,7 +6352,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes3_pdf.png": {
+    "strokes3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6397,7 +6397,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes_poly_pdf.png": {
+    "strokes_poly_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6442,7 +6442,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes_round_pdf.png": {
+    "strokes_round_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6487,7 +6487,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tablecolorfilter_pdf.png": {
+    "tablecolorfilter_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6541,7 +6541,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "testimagefilters_pdf.png": {
+    "testimagefilters_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6622,7 +6622,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "texteffects_pdf.png": {
+    "texteffects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6667,7 +6667,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "thinrects_pdf.png": {
+    "thinrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6712,7 +6712,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "thinstrokedrects_pdf.png": {
+    "thinstrokedrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6766,7 +6766,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tilemodes_pdf.png": {
+    "tilemodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6856,7 +6856,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "twopointconical_pdf.png": {
+    "twopointconical_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6901,7 +6901,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "verttext2_pdf.png": {
+    "verttext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6946,7 +6946,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "verttext_pdf.png": {
+    "verttext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7027,7 +7027,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "xfermodes2_pdf.png": {
+    "xfermodes2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7060,7 +7060,7 @@
         ]
       ]
     }, 
-    "xfermodes3_pdf.png": {
+    "xfermodes3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7113,7 +7113,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "xfermodes_pdf.png": {
+    "xfermodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
index 92b5aea..4c45cf5 100644
--- a/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "aarectmodes_pdf.png": {
+    "aarectmodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -155,7 +155,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "arithmode_pdf.png": {
+    "arithmode_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -209,7 +209,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bigmatrix_pdf.png": {
+    "bigmatrix_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -263,7 +263,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmapcopy_pdf.png": {
+    "bitmapcopy_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -317,7 +317,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmapfilters_pdf.png": {
+    "bitmapfilters_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -371,7 +371,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmapscroll_pdf.png": {
+    "bitmapscroll_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -480,7 +480,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_inner_fast_pdf.png": {
+    "blurrect_25_100_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -525,7 +525,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_inner_slow_pdf.png": {
+    "blurrect_25_100_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -570,7 +570,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_normal_fast_pdf.png": {
+    "blurrect_25_100_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -615,7 +615,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_normal_slow_pdf.png": {
+    "blurrect_25_100_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -660,7 +660,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_outer_fast_pdf.png": {
+    "blurrect_25_100_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -705,7 +705,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_outer_slow_pdf.png": {
+    "blurrect_25_100_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -750,7 +750,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_inner_fast_pdf.png": {
+    "blurrect_25_100_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -795,7 +795,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_inner_slow_pdf.png": {
+    "blurrect_25_100_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -840,7 +840,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_normal_fast_pdf.png": {
+    "blurrect_25_100_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -885,7 +885,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_normal_slow_pdf.png": {
+    "blurrect_25_100_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -930,7 +930,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_outer_fast_pdf.png": {
+    "blurrect_25_100_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -975,7 +975,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_outer_slow_pdf.png": {
+    "blurrect_25_100_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1029,7 +1029,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_inner_fast_pdf.png": {
+    "blurrect_5_100_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1074,7 +1074,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_inner_slow_pdf.png": {
+    "blurrect_5_100_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1119,7 +1119,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_normal_fast_pdf.png": {
+    "blurrect_5_100_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1164,7 +1164,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_normal_slow_pdf.png": {
+    "blurrect_5_100_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1209,7 +1209,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_outer_fast_pdf.png": {
+    "blurrect_5_100_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1254,7 +1254,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_outer_slow_pdf.png": {
+    "blurrect_5_100_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1299,7 +1299,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_inner_fast_pdf.png": {
+    "blurrect_5_100_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1344,7 +1344,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_inner_slow_pdf.png": {
+    "blurrect_5_100_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1389,7 +1389,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_normal_fast_pdf.png": {
+    "blurrect_5_100_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1434,7 +1434,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_normal_slow_pdf.png": {
+    "blurrect_5_100_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1479,7 +1479,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_outer_fast_pdf.png": {
+    "blurrect_5_100_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1524,7 +1524,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_outer_slow_pdf.png": {
+    "blurrect_5_100_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1569,7 +1569,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_inner_fast_pdf.png": {
+    "blurrect_5_5_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1614,7 +1614,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_inner_slow_pdf.png": {
+    "blurrect_5_5_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1659,7 +1659,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_normal_fast_pdf.png": {
+    "blurrect_5_5_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1704,7 +1704,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_normal_slow_pdf.png": {
+    "blurrect_5_5_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1749,7 +1749,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_outer_fast_pdf.png": {
+    "blurrect_5_5_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1794,7 +1794,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_outer_slow_pdf.png": {
+    "blurrect_5_5_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1839,7 +1839,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_inner_fast_pdf.png": {
+    "blurrect_5_5_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1884,7 +1884,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_inner_slow_pdf.png": {
+    "blurrect_5_5_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1929,7 +1929,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_normal_fast_pdf.png": {
+    "blurrect_5_5_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1974,7 +1974,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_normal_slow_pdf.png": {
+    "blurrect_5_5_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2019,7 +2019,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_outer_fast_pdf.png": {
+    "blurrect_5_5_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2064,7 +2064,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_outer_slow_pdf.png": {
+    "blurrect_5_5_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2127,7 +2127,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_100_100_10_pdf.png": {
+    "blurrect_slow_100_100_10_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2172,7 +2172,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_100_100_2_pdf.png": {
+    "blurrect_slow_100_100_2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2217,7 +2217,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_10_100_10_pdf.png": {
+    "blurrect_slow_10_100_10_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2244,7 +2244,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_slow_10_10_100_pdf.png": {
+    "blurrect_slow_10_10_100_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2298,7 +2298,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurs_pdf.png": {
+    "blurs_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2370,7 +2370,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "chrome_gradtext2_pdf.png": {
+    "chrome_gradtext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2424,7 +2424,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "circles_pdf.png": {
+    "circles_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2478,7 +2478,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "clamped_gradients_pdf.png": {
+    "clamped_gradients_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2541,7 +2541,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "colorfilterimagefilter_pdf.png": {
+    "colorfilterimagefilter_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2640,7 +2640,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_path_aa_pdf.png": {
+    "complexclip2_path_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2694,7 +2694,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_path_bw_pdf.png": {
+    "complexclip2_path_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2703,7 +2703,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_pdf.png": {
+    "complexclip2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2757,7 +2757,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_rect_aa_pdf.png": {
+    "complexclip2_rect_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2829,7 +2829,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_aa_layer_pdf.png": {
+    "complexclip_aa_layer_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2856,7 +2856,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_aa_pdf.png": {
+    "complexclip_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2928,7 +2928,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_bw_layer_pdf.png": {
+    "complexclip_bw_layer_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2955,7 +2955,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_bw_pdf.png": {
+    "complexclip_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3009,7 +3009,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "convexpaths_pdf.png": {
+    "convexpaths_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3063,7 +3063,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "cubicclosepath_pdf.png": {
+    "cubicclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3108,7 +3108,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "cubicpath_pdf.png": {
+    "cubicpath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3153,7 +3153,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashcubics_pdf.png": {
+    "dashcubics_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3198,7 +3198,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashing2_pdf.png": {
+    "dashing2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3243,7 +3243,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashing3_pdf.png": {
+    "dashing3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3297,7 +3297,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "degeneratesegments_pdf.png": {
+    "degeneratesegments_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3405,7 +3405,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawbitmapmatrix_pdf.png": {
+    "drawbitmapmatrix_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3450,7 +3450,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawbitmaprect_pdf.png": {
+    "drawbitmaprect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3495,7 +3495,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawlooper_pdf.png": {
+    "drawlooper_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3549,7 +3549,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "emptypath_pdf.png": {
+    "emptypath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3594,7 +3594,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filltypes_pdf.png": {
+    "filltypes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3648,7 +3648,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filltypespersp_pdf.png": {
+    "filltypespersp_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3693,7 +3693,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "fontscaler_pdf.png": {
+    "fontscaler_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3747,7 +3747,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gammatext_pdf.png": {
+    "gammatext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3981,7 +3981,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "giantbitmap_repeat_bilerp_scale_pdf.png": {
+    "giantbitmap_repeat_bilerp_scale_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4098,7 +4098,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_degenerate_2pt_pdf.png": {
+    "gradients_degenerate_2pt_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4161,7 +4161,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_local_perspective_pdf.png": {
+    "gradients_local_perspective_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4188,7 +4188,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_pdf.png": {
+    "gradients_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4242,7 +4242,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_view_perspective_pdf.png": {
+    "gradients_view_perspective_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4296,7 +4296,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradtext_pdf.png": {
+    "gradtext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4395,7 +4395,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imageblur_pdf.png": {
+    "imageblur_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4440,7 +4440,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imagefiltersbase_pdf.png": {
+    "imagefiltersbase_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4481,7 +4481,7 @@
         ]
       ]
     }, 
-    "imagefilterscropped_pdf.png": {
+    "imagefilterscropped_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4525,7 +4525,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imagefiltersgraph_pdf.png": {
+    "imagefiltersgraph_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4579,7 +4579,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lcdtext_pdf.png": {
+    "lcdtext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4633,7 +4633,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lighting_pdf.png": {
+    "lighting_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4687,7 +4687,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lineclosepath_pdf.png": {
+    "lineclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4732,7 +4732,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "linepath_pdf.png": {
+    "linepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4777,7 +4777,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "matrixconvolution_pdf.png": {
+    "matrixconvolution_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4858,7 +4858,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "morphology_pdf.png": {
+    "morphology_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4912,7 +4912,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "ninepatch-stretch_pdf.png": {
+    "ninepatch-stretch_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4993,7 +4993,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "ovals_pdf.png": {
+    "ovals_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5047,7 +5047,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "path-reverse_pdf.png": {
+    "path-reverse_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5101,7 +5101,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "patheffect_pdf.png": {
+    "patheffect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5146,7 +5146,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "pathfill_pdf.png": {
+    "pathfill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5200,7 +5200,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "pathinvfill_pdf.png": {
+    "pathinvfill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5263,7 +5263,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "points_pdf.png": {
+    "points_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5308,7 +5308,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "poly2poly_pdf.png": {
+    "poly2poly_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5362,7 +5362,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "quadclosepath_pdf.png": {
+    "quadclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5407,7 +5407,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "quadpath_pdf.png": {
+    "quadpath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5461,7 +5461,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "radial_gradient_pdf.png": {
+    "radial_gradient_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5506,7 +5506,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rects_pdf.png": {
+    "rects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5551,7 +5551,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "roundrects_pdf.png": {
+    "roundrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5614,7 +5614,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_aa_pdf.png": {
+    "rrect_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5659,7 +5659,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_bw_pdf.png": {
+    "rrect_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5704,7 +5704,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_clip_aa_pdf.png": {
+    "rrect_clip_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5749,7 +5749,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_clip_bw_pdf.png": {
+    "rrect_clip_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5776,7 +5776,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_pdf.png": {
+    "rrect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5821,7 +5821,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "samplerstress_pdf.png": {
+    "samplerstress_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5875,7 +5875,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shaderbounds_linear_pdf.png": {
+    "shaderbounds_linear_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5911,7 +5911,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext2_pdf.png": {
+    "shadertext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5956,7 +5956,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext3_pdf.png": {
+    "shadertext3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6010,7 +6010,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext_pdf.png": {
+    "shadertext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6064,7 +6064,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadows_pdf.png": {
+    "shadows_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6118,7 +6118,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "simpleaaclip_path_pdf.png": {
+    "simpleaaclip_path_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6172,7 +6172,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "simpleaaclip_rect_pdf.png": {
+    "simpleaaclip_rect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6226,7 +6226,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "stroke-fill_pdf.png": {
+    "stroke-fill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6298,7 +6298,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokerects_pdf.png": {
+    "strokerects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6352,7 +6352,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes3_pdf.png": {
+    "strokes3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6397,7 +6397,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes_poly_pdf.png": {
+    "strokes_poly_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6442,7 +6442,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes_round_pdf.png": {
+    "strokes_round_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6487,7 +6487,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tablecolorfilter_pdf.png": {
+    "tablecolorfilter_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6541,7 +6541,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "testimagefilters_pdf.png": {
+    "testimagefilters_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6622,7 +6622,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "texteffects_pdf.png": {
+    "texteffects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6667,7 +6667,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "thinrects_pdf.png": {
+    "thinrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6712,7 +6712,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "thinstrokedrects_pdf.png": {
+    "thinstrokedrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6766,7 +6766,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tilemodes_pdf.png": {
+    "tilemodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6856,7 +6856,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "twopointconical_pdf.png": {
+    "twopointconical_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6901,7 +6901,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "verttext2_pdf.png": {
+    "verttext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6946,7 +6946,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "verttext_pdf.png": {
+    "verttext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7027,7 +7027,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "xfermodes2_pdf.png": {
+    "xfermodes2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7060,7 +7060,7 @@
         ]
       ]
     }, 
-    "xfermodes3_pdf.png": {
+    "xfermodes3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7113,7 +7113,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "xfermodes_pdf.png": {
+    "xfermodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
diff --git a/expectations/gm/base-macpro/expected-results.json b/expectations/gm/base-macpro/expected-results.json
index 7bac2b8..0ba8b64 100644
--- a/expectations/gm/base-macpro/expected-results.json
+++ b/expectations/gm/base-macpro/expected-results.json
@@ -33,7 +33,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "3x3bitmaprect_pdf.png": {
+    "3x3bitmaprect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -69,7 +69,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "aaclip_pdf.png": {
+    "aaclip_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -105,7 +105,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "aarectmodes_pdf.png": {
+    "aarectmodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -141,7 +141,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "alphagradients_pdf.png": {
+    "alphagradients_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -177,7 +177,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "arithmode_pdf.png": {
+    "arithmode_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -213,7 +213,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bicubicfilter_pdf.png": {
+    "bicubicfilter_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -249,7 +249,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bigbitmaprect_i_pdf.png": {
+    "bigbitmaprect_i_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -285,7 +285,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bigbitmaprect_s_pdf.png": {
+    "bigbitmaprect_s_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -321,7 +321,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bigmatrix_pdf.png": {
+    "bigmatrix_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -357,7 +357,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bigtext_pdf.png": {
+    "bigtext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -393,7 +393,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmapcopy_pdf.png": {
+    "bitmapcopy_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -429,7 +429,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmapfilters_pdf.png": {
+    "bitmapfilters_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -465,7 +465,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmaprect_i_pdf.png": {
+    "bitmaprect_i_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -501,7 +501,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmaprect_s_pdf.png": {
+    "bitmaprect_s_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -537,7 +537,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmaprecttest_pdf.png": {
+    "bitmaprecttest_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -573,7 +573,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "bitmapscroll_pdf.png": {
+    "bitmapscroll_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -609,7 +609,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blend_pdf.png": {
+    "blend_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -645,7 +645,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_inner_fast_pdf.png": {
+    "blurrect_25_100_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -681,7 +681,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_inner_slow_pdf.png": {
+    "blurrect_25_100_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -717,7 +717,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_normal_fast_pdf.png": {
+    "blurrect_25_100_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -753,7 +753,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_normal_slow_pdf.png": {
+    "blurrect_25_100_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -789,7 +789,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_outer_fast_pdf.png": {
+    "blurrect_25_100_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -825,7 +825,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_20_outer_slow_pdf.png": {
+    "blurrect_25_100_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -861,7 +861,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_inner_fast_pdf.png": {
+    "blurrect_25_100_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -897,7 +897,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_inner_slow_pdf.png": {
+    "blurrect_25_100_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -933,7 +933,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_normal_fast_pdf.png": {
+    "blurrect_25_100_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -969,7 +969,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_normal_slow_pdf.png": {
+    "blurrect_25_100_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1005,7 +1005,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_outer_fast_pdf.png": {
+    "blurrect_25_100_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1041,7 +1041,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_25_100_2_outer_slow_pdf.png": {
+    "blurrect_25_100_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1086,7 +1086,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_inner_fast_pdf.png": {
+    "blurrect_5_100_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1122,7 +1122,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_inner_slow_pdf.png": {
+    "blurrect_5_100_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1158,7 +1158,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_normal_fast_pdf.png": {
+    "blurrect_5_100_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1194,7 +1194,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_normal_slow_pdf.png": {
+    "blurrect_5_100_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1230,7 +1230,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_outer_fast_pdf.png": {
+    "blurrect_5_100_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1266,7 +1266,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_20_outer_slow_pdf.png": {
+    "blurrect_5_100_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1302,7 +1302,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_inner_fast_pdf.png": {
+    "blurrect_5_100_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1338,7 +1338,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_inner_slow_pdf.png": {
+    "blurrect_5_100_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1374,7 +1374,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_normal_fast_pdf.png": {
+    "blurrect_5_100_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1410,7 +1410,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_normal_slow_pdf.png": {
+    "blurrect_5_100_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1446,7 +1446,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_outer_fast_pdf.png": {
+    "blurrect_5_100_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1482,7 +1482,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_100_2_outer_slow_pdf.png": {
+    "blurrect_5_100_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1518,7 +1518,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_inner_fast_pdf.png": {
+    "blurrect_5_5_20_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1554,7 +1554,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_inner_slow_pdf.png": {
+    "blurrect_5_5_20_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1590,7 +1590,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_normal_fast_pdf.png": {
+    "blurrect_5_5_20_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1626,7 +1626,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_normal_slow_pdf.png": {
+    "blurrect_5_5_20_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1662,7 +1662,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_outer_fast_pdf.png": {
+    "blurrect_5_5_20_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1698,7 +1698,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_20_outer_slow_pdf.png": {
+    "blurrect_5_5_20_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1734,7 +1734,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_inner_fast_pdf.png": {
+    "blurrect_5_5_2_inner_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1770,7 +1770,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_inner_slow_pdf.png": {
+    "blurrect_5_5_2_inner_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1806,7 +1806,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_normal_fast_pdf.png": {
+    "blurrect_5_5_2_normal_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1842,7 +1842,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_normal_slow_pdf.png": {
+    "blurrect_5_5_2_normal_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1878,7 +1878,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_outer_fast_pdf.png": {
+    "blurrect_5_5_2_outer_fast_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -1914,7 +1914,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_5_5_2_outer_slow_pdf.png": {
+    "blurrect_5_5_2_outer_slow_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2004,7 +2004,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_inner_pdf.png": {
+    "blurrect_inner_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2040,7 +2040,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_normal_pdf.png": {
+    "blurrect_normal_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2076,7 +2076,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_outer_pdf.png": {
+    "blurrect_outer_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2112,7 +2112,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurrect_solid_pdf.png": {
+    "blurrect_solid_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2148,7 +2148,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "blurs_pdf.png": {
+    "blurs_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2184,7 +2184,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "chrome_gradtext1_pdf.png": {
+    "chrome_gradtext1_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2220,7 +2220,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "chrome_gradtext2_pdf.png": {
+    "chrome_gradtext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2256,7 +2256,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "circles_pdf.png": {
+    "circles_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2292,7 +2292,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "clamped_gradients_pdf.png": {
+    "clamped_gradients_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2328,7 +2328,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "clippedcubic_pdf.png": {
+    "clippedcubic_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2364,7 +2364,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "cmykjpeg_pdf.png": {
+    "cmykjpeg_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2400,7 +2400,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "colorfilterimagefilter_pdf.png": {
+    "colorfilterimagefilter_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2436,7 +2436,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "colormatrix_pdf.png": {
+    "colormatrix_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2472,7 +2472,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "colortype_pdf.png": {
+    "colortype_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2535,7 +2535,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_path_aa_pdf.png": {
+    "complexclip2_path_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2571,7 +2571,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_path_bw_pdf.png": {
+    "complexclip2_path_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2580,7 +2580,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_pdf.png": {
+    "complexclip2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2616,7 +2616,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip2_rect_aa_pdf.png": {
+    "complexclip2_rect_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2679,7 +2679,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_aa_layer_pdf.png": {
+    "complexclip_aa_layer_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2688,7 +2688,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_aa_pdf.png": {
+    "complexclip_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2751,7 +2751,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_bw_layer_pdf.png": {
+    "complexclip_bw_layer_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2760,7 +2760,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "complexclip_bw_pdf.png": {
+    "complexclip_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2805,7 +2805,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "composeshader_pdf.png": {
+    "composeshader_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2841,7 +2841,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "convexpaths_pdf.png": {
+    "convexpaths_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2877,7 +2877,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "cubicclosepath_pdf.png": {
+    "cubicclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2913,7 +2913,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "cubicpath_pdf.png": {
+    "cubicpath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2949,7 +2949,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashcubics_pdf.png": {
+    "dashcubics_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -2985,7 +2985,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashing2_pdf.png": {
+    "dashing2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3021,7 +3021,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashing3_pdf.png": {
+    "dashing3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3057,7 +3057,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "dashing_pdf.png": {
+    "dashing_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3093,7 +3093,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "degeneratesegments_pdf.png": {
+    "degeneratesegments_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3129,7 +3129,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "deviceproperties_pdf.png": {
+    "deviceproperties_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3165,7 +3165,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "displacement_pdf.png": {
+    "displacement_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3201,7 +3201,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "distantclip_pdf.png": {
+    "distantclip_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3237,7 +3237,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawbitmapmatrix_pdf.png": {
+    "drawbitmapmatrix_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3273,7 +3273,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawbitmaprect_pdf.png": {
+    "drawbitmaprect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3309,7 +3309,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "drawlooper_pdf.png": {
+    "drawlooper_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3345,7 +3345,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "emptypath_pdf.png": {
+    "emptypath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3381,7 +3381,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "extractbitmap_pdf.png": {
+    "extractbitmap_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3417,7 +3417,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "factory_pdf.png": {
+    "factory_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3453,7 +3453,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "fatpathfill_pdf.png": {
+    "fatpathfill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3489,7 +3489,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filltypes_pdf.png": {
+    "filltypes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3525,7 +3525,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filltypespersp_pdf.png": {
+    "filltypespersp_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3570,7 +3570,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filterbitmap_checkerboard_192_192_pdf.png": {
+    "filterbitmap_checkerboard_192_192_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3606,7 +3606,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filterbitmap_checkerboard_32_2_pdf.png": {
+    "filterbitmap_checkerboard_32_2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3642,7 +3642,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filterbitmap_checkerboard_32_32_pdf.png": {
+    "filterbitmap_checkerboard_32_32_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3678,7 +3678,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filterbitmap_checkerboard_32_8_pdf.png": {
+    "filterbitmap_checkerboard_32_8_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3714,7 +3714,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filterbitmap_checkerboard_4_4_pdf.png": {
+    "filterbitmap_checkerboard_4_4_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3750,7 +3750,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filterbitmap_image_mandrill_128.png_pdf.png": {
+    "filterbitmap_image_mandrill_128.png_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3786,7 +3786,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filterbitmap_image_mandrill_16.png_pdf.png": {
+    "filterbitmap_image_mandrill_16.png_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3822,7 +3822,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filterbitmap_image_mandrill_256.png_pdf.png": {
+    "filterbitmap_image_mandrill_256.png_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3858,7 +3858,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filterbitmap_image_mandrill_32.png_pdf.png": {
+    "filterbitmap_image_mandrill_32.png_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3894,7 +3894,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filterbitmap_image_mandrill_512.png_pdf.png": {
+    "filterbitmap_image_mandrill_512.png_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3930,7 +3930,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filterbitmap_image_mandrill_64.png_pdf.png": {
+    "filterbitmap_image_mandrill_64.png_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -3966,7 +3966,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filterbitmap_text_10.00pt_pdf.png": {
+    "filterbitmap_text_10.00pt_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4002,7 +4002,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filterbitmap_text_3.00pt_pdf.png": {
+    "filterbitmap_text_3.00pt_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4038,7 +4038,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "filterbitmap_text_7.00pt_pdf.png": {
+    "filterbitmap_text_7.00pt_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4101,7 +4101,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "fontmgr_match_pdf.png": {
+    "fontmgr_match_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4137,7 +4137,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "fontscaler_pdf.png": {
+    "fontscaler_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4173,7 +4173,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gammatext_pdf.png": {
+    "gammatext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4209,7 +4209,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "getpostextpath_pdf.png": {
+    "getpostextpath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4245,7 +4245,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "giantbitmap_clamp_bilerp_rotate_pdf.png": {
+    "giantbitmap_clamp_bilerp_rotate_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4281,7 +4281,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "giantbitmap_clamp_bilerp_scale_pdf.png": {
+    "giantbitmap_clamp_bilerp_scale_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4317,7 +4317,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "giantbitmap_clamp_point_rotate_pdf.png": {
+    "giantbitmap_clamp_point_rotate_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4353,7 +4353,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "giantbitmap_clamp_point_scale_pdf.png": {
+    "giantbitmap_clamp_point_scale_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4389,7 +4389,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "giantbitmap_mirror_bilerp_rotate_pdf.png": {
+    "giantbitmap_mirror_bilerp_rotate_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4425,7 +4425,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "giantbitmap_mirror_bilerp_scale_pdf.png": {
+    "giantbitmap_mirror_bilerp_scale_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4461,7 +4461,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "giantbitmap_mirror_point_rotate_pdf.png": {
+    "giantbitmap_mirror_point_rotate_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4497,7 +4497,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "giantbitmap_mirror_point_scale_pdf.png": {
+    "giantbitmap_mirror_point_scale_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4533,7 +4533,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "giantbitmap_repeat_bilerp_rotate_pdf.png": {
+    "giantbitmap_repeat_bilerp_rotate_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4569,7 +4569,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "giantbitmap_repeat_bilerp_scale_pdf.png": {
+    "giantbitmap_repeat_bilerp_scale_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4605,7 +4605,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "giantbitmap_repeat_point_rotate_pdf.png": {
+    "giantbitmap_repeat_point_rotate_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4641,7 +4641,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "giantbitmap_repeat_point_scale_pdf.png": {
+    "giantbitmap_repeat_point_scale_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4695,7 +4695,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_degenerate_2pt_pdf.png": {
+    "gradients_degenerate_2pt_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4740,7 +4740,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_local_perspective_pdf.png": {
+    "gradients_local_perspective_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4749,7 +4749,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_pdf.png": {
+    "gradients_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4785,7 +4785,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradients_view_perspective_pdf.png": {
+    "gradients_view_perspective_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4821,7 +4821,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "gradtext_pdf.png": {
+    "gradtext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4857,7 +4857,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "hairlines_pdf.png": {
+    "hairlines_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4920,7 +4920,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "hittestpath_pdf.png": {
+    "hittestpath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -4956,7 +4956,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "image-surface_pdf.png": {
+    "image-surface_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5019,7 +5019,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imageblur_pdf.png": {
+    "imageblur_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5055,7 +5055,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imagefiltersbase_pdf.png": {
+    "imagefiltersbase_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5091,7 +5091,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imagefiltersgraph_pdf.png": {
+    "imagefiltersgraph_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5127,7 +5127,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "imagemagnifier_pdf.png": {
+    "imagemagnifier_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5163,7 +5163,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "internal_links_pdf.png": {
+    "internal_links_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5199,7 +5199,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lcdtext_pdf.png": {
+    "lcdtext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5235,7 +5235,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lerpmode_pdf.png": {
+    "lerpmode_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5271,7 +5271,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lighting_pdf.png": {
+    "lighting_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5307,7 +5307,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "lineclosepath_pdf.png": {
+    "lineclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5343,7 +5343,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "linepath_pdf.png": {
+    "linepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5379,7 +5379,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "matrixconvolution_pdf.png": {
+    "matrixconvolution_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5415,7 +5415,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "megalooper_0x0_pdf.png": {
+    "megalooper_0x0_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5451,7 +5451,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "megalooper_1x4_pdf.png": {
+    "megalooper_1x4_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5487,7 +5487,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "megalooper_4x1_pdf.png": {
+    "megalooper_4x1_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5523,7 +5523,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "mixed_xfermodes_pdf.png": {
+    "mixed_xfermodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5559,7 +5559,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "modecolorfilters_pdf.png": {
+    "modecolorfilters_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5595,7 +5595,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "morphology_pdf.png": {
+    "morphology_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5631,7 +5631,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "ninepatch-stretch_pdf.png": {
+    "ninepatch-stretch_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5667,7 +5667,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "nocolorbleed_pdf.png": {
+    "nocolorbleed_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5703,7 +5703,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "optimizations_pdf.png": {
+    "optimizations_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5739,7 +5739,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "ovals_pdf.png": {
+    "ovals_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5775,7 +5775,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "path-reverse_pdf.png": {
+    "path-reverse_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5811,7 +5811,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "patheffect_pdf.png": {
+    "patheffect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5847,7 +5847,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "pathfill_pdf.png": {
+    "pathfill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5883,7 +5883,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "pathinterior_pdf.png": {
+    "pathinterior_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5919,7 +5919,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "pathinvfill_pdf.png": {
+    "pathinvfill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5955,7 +5955,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "pathopsinverse_pdf.png": {
+    "pathopsinverse_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -5991,7 +5991,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "pathopsskpclip_pdf.png": {
+    "pathopsskpclip_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6027,7 +6027,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "perlinnoise_pdf.png": {
+    "perlinnoise_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6063,7 +6063,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "points_pdf.png": {
+    "points_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6099,7 +6099,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "poly2poly_pdf.png": {
+    "poly2poly_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6135,7 +6135,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "quadclosepath_pdf.png": {
+    "quadclosepath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6171,7 +6171,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "quadpath_pdf.png": {
+    "quadpath_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6207,7 +6207,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "radial_gradient_pdf.png": {
+    "radial_gradient_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6243,7 +6243,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rects_pdf.png": {
+    "rects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6279,7 +6279,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "roundrects_pdf.png": {
+    "roundrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6333,7 +6333,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_aa_pdf.png": {
+    "rrect_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6369,7 +6369,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_bw_pdf.png": {
+    "rrect_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6405,7 +6405,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_clip_aa_pdf.png": {
+    "rrect_clip_aa_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6441,7 +6441,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_clip_bw_pdf.png": {
+    "rrect_clip_bw_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6459,7 +6459,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "rrect_pdf.png": {
+    "rrect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6495,7 +6495,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "samplerstress_pdf.png": {
+    "samplerstress_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6531,7 +6531,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "selftest1_pdf.png": {
+    "selftest1_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6567,7 +6567,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "selftest2_pdf.png": {
+    "selftest2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6603,7 +6603,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shaderbounds_linear_pdf.png": {
+    "shaderbounds_linear_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6630,7 +6630,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext2_pdf.png": {
+    "shadertext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6666,7 +6666,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext3_pdf.png": {
+    "shadertext3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6702,7 +6702,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadertext_pdf.png": {
+    "shadertext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6738,7 +6738,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shadows_pdf.png": {
+    "shadows_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6774,7 +6774,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shallow_gradient_conical_pdf.png": {
+    "shallow_gradient_conical_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6810,7 +6810,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shallow_gradient_linear_pdf.png": {
+    "shallow_gradient_linear_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6846,7 +6846,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shallow_gradient_radial_pdf.png": {
+    "shallow_gradient_radial_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6882,7 +6882,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "shallow_gradient_sweep_pdf.png": {
+    "shallow_gradient_sweep_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6918,7 +6918,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "simpleaaclip_aaclip_pdf.png": {
+    "simpleaaclip_aaclip_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6954,7 +6954,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "simpleaaclip_path_pdf.png": {
+    "simpleaaclip_path_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -6990,7 +6990,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "simpleaaclip_rect_pdf.png": {
+    "simpleaaclip_rect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7026,7 +7026,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "spritebitmap_pdf.png": {
+    "spritebitmap_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7062,7 +7062,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "srcmode_pdf.png": {
+    "srcmode_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7098,7 +7098,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "stroke-fill_pdf.png": {
+    "stroke-fill_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7134,7 +7134,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokerect_pdf.png": {
+    "strokerect_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7170,7 +7170,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokerects_pdf.png": {
+    "strokerects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7206,7 +7206,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes3_pdf.png": {
+    "strokes3_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7242,7 +7242,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes_poly_pdf.png": {
+    "strokes_poly_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7278,7 +7278,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "strokes_round_pdf.png": {
+    "strokes_round_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7314,7 +7314,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tablecolorfilter_pdf.png": {
+    "tablecolorfilter_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7350,7 +7350,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "testimagefilters_pdf.png": {
+    "testimagefilters_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7386,7 +7386,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "texdata_pdf.png": {
+    "texdata_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7422,7 +7422,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "texteffects_pdf.png": {
+    "texteffects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7458,7 +7458,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "thinrects_pdf.png": {
+    "thinrects_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7494,7 +7494,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tilemode_bitmap_pdf.png": {
+    "tilemode_bitmap_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7530,7 +7530,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tilemode_gradient_pdf.png": {
+    "tilemode_gradient_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7566,7 +7566,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tilemodes_pdf.png": {
+    "tilemodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7602,7 +7602,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "tinybitmap_pdf.png": {
+    "tinybitmap_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7638,7 +7638,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "twopointconical_pdf.png": {
+    "twopointconical_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7674,7 +7674,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "typeface_pdf.png": {
+    "typeface_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7710,7 +7710,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "typefacestyles_pdf.png": {
+    "typefacestyles_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7746,7 +7746,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "verttext2_pdf.png": {
+    "verttext2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7782,7 +7782,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "verttext_pdf.png": {
+    "verttext_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7818,7 +7818,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "verylargebitmap_pdf.png": {
+    "verylargebitmap_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7854,7 +7854,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "xfermodes2_pdf.png": {
+    "xfermodes2_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7890,7 +7890,7 @@
       ], 
       "ignore-failure": false
     }, 
-    "xfermodes_pdf.png": {
+    "xfermodes_pdf-mac.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
@@ -7900,4 +7900,4 @@
       "ignore-failure": false
     }
   }
-}
\ No newline at end of file
+}
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index 4db3a0d..32ad413 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -860,14 +860,15 @@
      *
      * @param gm which test generated the actualBitmap
      * @param gRec
+     * @param configName The config name to look for in the expectation file.
      * @param actualBitmapAndDigest ptr to bitmap generated by this run, or NULL
      *        if we don't have a usable bitmap representation
      */
     ErrorCombination compare_test_results_to_stored_expectations(
-        GM* gm, const ConfigData& gRec,
+        GM* gm, const ConfigData& gRec, const char* configName,
         const BitmapAndDigest* actualBitmapAndDigest) {
 
-        SkString shortNamePlusConfig = make_shortname_plus_config(gm->shortName(), gRec.fName);
+        SkString shortNamePlusConfig = make_shortname_plus_config(gm->shortName(), configName);
 
         ErrorCombination errors;
 
@@ -905,7 +906,7 @@
                  */
                 Expectations expectations = expectationsSource->get(nameWithExtension.c_str());
                 errors.add(compare_to_expectations(expectations, *actualBitmapAndDigest,
-                                                   gm->shortName(), gRec.fName, "", true));
+                                                   gm->shortName(), configName, "", true));
             } else {
                 // If we are running without expectations, we still want to
                 // record the actual results.
@@ -1022,7 +1023,7 @@
             }
             BitmapAndDigest bitmapAndDigest(*bitmap);
             errors.add(compare_test_results_to_stored_expectations(
-                           gm, gRec, &bitmapAndDigest));
+                           gm, gRec, gRec.fName, &bitmapAndDigest));
 
             if (writePath && (gRec.fFlags & kWrite_ConfigFlag)) {
                 path = make_bitmap_filename(writePath, gm->shortName(), gRec.fName,
@@ -1051,13 +1052,13 @@
                         continue;
                     }
 
+                    SkString configName(gRec.fName);
+                    configName.append("-");
+                    configName.append(pdfRasterizers[i]->fName);
+
                     BitmapAndDigest bitmapAndDigest(pdfBitmap);
                     errors.add(compare_test_results_to_stored_expectations(
-                               gm, gRec, &bitmapAndDigest));
-
-                    SkString configName(gRec.fName);
-                    configName.append("_");
-                    configName.append(pdfRasterizers[i]->fName);
+                               gm, gRec, configName.c_str(), &bitmapAndDigest));
 
                     if (writePath && (gRec.fFlags & kWrite_ConfigFlag)) {
                         path = make_bitmap_filename(writePath, gm->shortName(), configName.c_str(),
@@ -1073,7 +1074,7 @@
             SkAutoTUnref<SkStreamAsset> documentStream(document.detachAsStream());
 
             errors.add(compare_test_results_to_stored_expectations(
-                           gm, gRec, NULL));
+                           gm, gRec, gRec.fName, NULL));
 
             if (writePath && (gRec.fFlags & kWrite_ConfigFlag)) {
                 path = make_filename(writePath, gm->shortName(), gRec.fName, "", "xps");
@@ -1825,7 +1826,7 @@
             if (config.fBackend == kPDF_Backend) {
                 for (int j = 0; j < pdfRasterizers.count(); j++) {
                     SkString pdfSubdir = subdir;
-                    pdfSubdir.appendf("_%s", pdfRasterizers[j]->fName);
+                    pdfSubdir.appendf("-%s", pdfRasterizers[j]->fName);
                     if (!sk_mkdir(pdfSubdir.c_str())) {
                         return false;
                     }
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/json-summary.txt b/gm/tests/outputs/add-config-pdf/output-expected/json-summary.txt
index 52eedd4..a341d6a 100644
--- a/gm/tests/outputs/add-config-pdf/output-expected/json-summary.txt
+++ b/gm/tests/outputs/add-config-pdf/output-expected/json-summary.txt
@@ -3,7 +3,7 @@
       "failed" : null,
       "failure-ignored" : null,
       "no-comparison" : {
-         "pdf/selftest1.png" : [ "bitmap-64bitMD5", 1149339852105949057 ]
+         "pdf-poppler/selftest1.png" : [ "bitmap-64bitMD5", 1149339852105949057 ]
       },
       "succeeded" : {
          "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
@@ -23,7 +23,7 @@
          ],
          "ignore-failure" : false
       },
-      "pdf/selftest1.png" : {
+      "pdf-poppler/selftest1.png" : {
          "allowed-digests" : null,
          "ignore-failure" : false
       }
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/mismatchPath/pdf_poppler/bogusfile b/gm/tests/outputs/add-config-pdf/output-expected/mismatchPath/pdf-poppler/bogusfile
similarity index 100%
rename from gm/tests/outputs/add-config-pdf/output-expected/mismatchPath/pdf_poppler/bogusfile
rename to gm/tests/outputs/add-config-pdf/output-expected/mismatchPath/pdf-poppler/bogusfile
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/pdf_poppler/bogusfile b/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/pdf-poppler/bogusfile
similarity index 100%
rename from gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/pdf_poppler/bogusfile
rename to gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/pdf-poppler/bogusfile
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/pdf-poppler/selftest1.png b/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/pdf-poppler/selftest1.png
new file mode 100644
index 0000000..b644e4d
--- /dev/null
+++ b/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/pdf-poppler/selftest1.png
@@ -0,0 +1 @@
+[contents of gm/tests/outputs/add-config-pdf/output-actual/missingExpectationsPath/pdf-poppler/selftest1.png]
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/pdf/selftest1.png b/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/pdf/selftest1.png
deleted file mode 100644
index e5584b8..0000000
--- a/gm/tests/outputs/add-config-pdf/output-expected/missingExpectationsPath/pdf/selftest1.png
+++ /dev/null
@@ -1 +0,0 @@
-[contents of gm/tests/outputs/add-config-pdf/output-actual/missingExpectationsPath/pdf/selftest1.png]
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf_poppler/bogusfile b/gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf-poppler/bogusfile
similarity index 100%
rename from gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf_poppler/bogusfile
rename to gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf-poppler/bogusfile
diff --git a/gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf_poppler/selftest1.png b/gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf-poppler/selftest1.png
similarity index 66%
rename from gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf_poppler/selftest1.png
rename to gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf-poppler/selftest1.png
index 5d008d8..052f1a9 100644
--- a/gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf_poppler/selftest1.png
+++ b/gm/tests/outputs/add-config-pdf/output-expected/writePath/pdf-poppler/selftest1.png
@@ -1 +1 @@
-[contents of gm/tests/outputs/add-config-pdf/output-actual/writePath/pdf_poppler/selftest1.png]
+[contents of gm/tests/outputs/add-config-pdf/output-actual/writePath/pdf-poppler/selftest1.png]