aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json20
-rw-r--r--expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json20
-rw-r--r--expectations/gm/Test-Android-IntelRhb-SGX544-x86-Debug/expected-results.json14
-rw-r--r--expectations/gm/Test-Android-IntelRhb-SGX544-x86-Release/expected-results.json14
-rw-r--r--expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json22
-rw-r--r--expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json22
-rw-r--r--expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json20
-rw-r--r--expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json20
-rw-r--r--expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json17
-rw-r--r--expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json11
-rw-r--r--expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json17
-rw-r--r--expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json17
-rw-r--r--expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json8
-rw-r--r--expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json8
-rw-r--r--expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json14
-rw-r--r--expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json14
-rw-r--r--expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json14
-rw-r--r--expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json14
-rw-r--r--expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json14
-rw-r--r--expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Release/expected-results.json14
-rw-r--r--expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Debug/expected-results.json32
-rw-r--r--expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release/expected-results.json26
-rw-r--r--expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json32
-rw-r--r--expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json29
-rw-r--r--expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Debug/expected-results.json35
-rw-r--r--expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86-Release/expected-results.json32
-rw-r--r--expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json35
-rw-r--r--expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json32
-rw-r--r--expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/expected-results.json32
-rw-r--r--expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release/expected-results.json26
-rw-r--r--expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json32
-rw-r--r--expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json26
-rw-r--r--expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug/expected-results.json23
-rw-r--r--expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Release/expected-results.json23
-rw-r--r--expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Debug/expected-results.json22
-rw-r--r--expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/expected-results.json23
-rw-r--r--expectations/gm/Test-Ubuntu12-ShuttleA-NoGPU-x86_64-Debug/expected-results.json23
-rw-r--r--expectations/gm/Test-Ubuntu13-ShuttleA-HD2000-x86_64-Debug-ASAN/expected-results.json26
-rw-r--r--expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE/expected-results.json31
-rw-r--r--expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite/expected-results.json21
-rw-r--r--expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json21
-rw-r--r--expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json31
-rw-r--r--expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/expected-results.json21
-rw-r--r--expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json21
-rw-r--r--expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json21
-rw-r--r--expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json21
-rw-r--r--gm/imagefilterscropped.cpp17
-rwxr-xr-xinclude/effects/SkMergeImageFilter.h6
-rwxr-xr-xsrc/effects/SkMergeImageFilter.cpp16
49 files changed, 648 insertions, 402 deletions
diff --git a/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json
index 96ffb65e93..73a2833d20 100644
--- a/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json
@@ -4152,7 +4152,8 @@
"bitmap-64bitMD5",
15874902076289220233
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -4160,7 +4161,8 @@
"bitmap-64bitMD5",
16938546007537835588
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -4168,7 +4170,8 @@
"bitmap-64bitMD5",
7671216771353139320
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_msaa4.png": {
"allowed-digests": [
@@ -4176,7 +4179,8 @@
"bitmap-64bitMD5",
10336696603410756485
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -6075,7 +6079,7 @@
2449762981896068609
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -6084,7 +6088,7 @@
91395995868500721
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -6093,7 +6097,7 @@
16742246364934886044
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -6585,4 +6589,4 @@
"ignore-failure": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json
index 1649ef735e..4f87975a79 100644
--- a/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json
@@ -4144,7 +4144,8 @@
"bitmap-64bitMD5",
15874902076289220233
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -4152,7 +4153,8 @@
"bitmap-64bitMD5",
16938546007537835588
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -4160,7 +4162,8 @@
"bitmap-64bitMD5",
7671216771353139320
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_msaa4.png": {
"allowed-digests": [
@@ -4168,7 +4171,8 @@
"bitmap-64bitMD5",
10336696603410756485
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -6067,7 +6071,7 @@
2449762981896068609
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -6076,7 +6080,7 @@
91395995868500721
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -6085,7 +6089,7 @@
16742246364934886044
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -6577,4 +6581,4 @@
"ignore-failure": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Debug/expected-results.json b/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Debug/expected-results.json
index c8d4033d14..e0292a4d67 100644
--- a/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Debug/expected-results.json
@@ -3810,7 +3810,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -3822,7 +3823,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -5514,7 +5516,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -5526,7 +5529,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -5961,4 +5965,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Release/expected-results.json b/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Release/expected-results.json
index 87276a8c5b..4844c50508 100644
--- a/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Android-IntelRhb-SGX544-x86-Release/expected-results.json
@@ -3810,7 +3810,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -3822,7 +3823,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -5514,7 +5516,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -5526,7 +5529,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -5961,4 +5965,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
index 9e6e595b91..7637b26020 100644
--- a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
@@ -6757,7 +6757,8 @@
"bitmap-64bitMD5",
15874902076289220233
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -6765,7 +6766,8 @@
"bitmap-64bitMD5",
16938546007537835588
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -6773,7 +6775,8 @@
"bitmap-64bitMD5",
12990307105942617283
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_msaa4.png": {
"allowed-digests": [
@@ -6781,7 +6784,8 @@
"bitmap-64bitMD5",
8605461325748219665
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -9665,7 +9669,7 @@
2449762981896068609
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -9674,7 +9678,7 @@
91395995868500721
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -9683,7 +9687,7 @@
15677724425077249603
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_msaa4.png": {
"allowed-digests": [
@@ -9692,7 +9696,7 @@
3654520999578147112
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -10423,4 +10427,4 @@
"ignore-failure": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
index 9e6e595b91..7637b26020 100644
--- a/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
@@ -6757,7 +6757,8 @@
"bitmap-64bitMD5",
15874902076289220233
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -6765,7 +6766,8 @@
"bitmap-64bitMD5",
16938546007537835588
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -6773,7 +6775,8 @@
"bitmap-64bitMD5",
12990307105942617283
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_msaa4.png": {
"allowed-digests": [
@@ -6781,7 +6784,8 @@
"bitmap-64bitMD5",
8605461325748219665
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -9665,7 +9669,7 @@
2449762981896068609
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -9674,7 +9678,7 @@
91395995868500721
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -9683,7 +9687,7 @@
15677724425077249603
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_msaa4.png": {
"allowed-digests": [
@@ -9692,7 +9696,7 @@
3654520999578147112
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -10423,4 +10427,4 @@
"ignore-failure": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json
index 8c864049fa..bc10647758 100644
--- a/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Debug/expected-results.json
@@ -5314,7 +5314,8 @@
"bitmap-64bitMD5",
17318846310258594258
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -5322,7 +5323,8 @@
"bitmap-64bitMD5",
1344992806587217981
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -5330,7 +5332,8 @@
"bitmap-64bitMD5",
7586563415490930520
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -7645,7 +7648,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -7657,7 +7661,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -7669,7 +7674,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -8273,4 +8279,4 @@
"ignore-failure": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
index 3bbfae01be..b1ca668c88 100644
--- a/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus4-Adreno320-Arm7-Release/expected-results.json
@@ -5302,7 +5302,8 @@
"bitmap-64bitMD5",
17318846310258594258
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -5310,7 +5311,8 @@
"bitmap-64bitMD5",
1344992806587217981
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -5318,7 +5320,8 @@
"bitmap-64bitMD5",
7586563415490930520
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -7633,7 +7636,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -7645,7 +7649,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -7657,7 +7662,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -8261,4 +8267,4 @@
"ignore-failure": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
index 2afeddd409..fd8c2c9f4c 100644
--- a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json
@@ -4878,7 +4878,8 @@
"bitmap-64bitMD5",
17318846310258594258
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -4886,7 +4887,8 @@
"bitmap-64bitMD5",
1344992806587217981
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -4894,7 +4896,8 @@
"bitmap-64bitMD5",
4749106225008301070
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -7015,7 +7018,7 @@
2449762981896068609
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -7024,7 +7027,7 @@
91395995868500721
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -7033,7 +7036,7 @@
12875111007112756305
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -7564,4 +7567,4 @@
"ignore-failure": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
index 2afeddd409..1e755ed1b6 100644
--- a/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
@@ -4878,7 +4878,8 @@
"bitmap-64bitMD5",
17318846310258594258
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -4886,7 +4887,8 @@
"bitmap-64bitMD5",
1344992806587217981
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -4894,7 +4896,8 @@
"bitmap-64bitMD5",
4749106225008301070
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -7564,4 +7567,4 @@
"ignore-failure": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json
index 8185e45422..1ee96a4487 100644
--- a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json
@@ -4185,7 +4185,8 @@
"bitmap-64bitMD5",
17318846310258594258
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -4193,7 +4194,8 @@
"bitmap-64bitMD5",
1344992806587217981
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -4201,7 +4203,8 @@
"bitmap-64bitMD5",
3391964154679602478
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -6064,7 +6067,7 @@
2449762981896068609
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -6073,7 +6076,7 @@
91395995868500721
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -6082,7 +6085,7 @@
4493358659998766532
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -6556,4 +6559,4 @@
"ignore-failure": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json
index 8185e45422..1ee96a4487 100644
--- a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json
@@ -4185,7 +4185,8 @@
"bitmap-64bitMD5",
17318846310258594258
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -4193,7 +4194,8 @@
"bitmap-64bitMD5",
1344992806587217981
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -4201,7 +4203,8 @@
"bitmap-64bitMD5",
3391964154679602478
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -6064,7 +6067,7 @@
2449762981896068609
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -6073,7 +6076,7 @@
91395995868500721
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -6082,7 +6085,7 @@
4493358659998766532
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -6556,4 +6559,4 @@
"ignore-failure": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
index a56e7cd155..d7d134e899 100644
--- a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
@@ -3613,7 +3613,7 @@
2449762981896068609
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -3622,7 +3622,7 @@
91395995868500721
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -3631,7 +3631,7 @@
3345453265832461500
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -3904,4 +3904,4 @@
"ignore-failure": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
index a56e7cd155..d7d134e899 100644
--- a/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
@@ -3613,7 +3613,7 @@
2449762981896068609
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -3622,7 +3622,7 @@
91395995868500721
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -3631,7 +3631,7 @@
3345453265832461500
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -3904,4 +3904,4 @@
"ignore-failure": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json b/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json
index 56f698235e..cd82ddba15 100644
--- a/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json
@@ -3874,7 +3874,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -3886,7 +3887,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -5590,7 +5592,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -5602,7 +5605,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texteffects_565.png": {
"allowed-digests": [
@@ -6037,4 +6041,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json b/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json
index d71b523e43..426311db4e 100644
--- a/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json
@@ -3874,7 +3874,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -3886,7 +3887,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -5590,7 +5592,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -5602,7 +5605,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texteffects_565.png": {
"allowed-digests": [
@@ -6037,4 +6041,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json b/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json
index 6a3a4f5fd9..08d4d3d908 100644
--- a/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json
@@ -3874,7 +3874,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -3886,7 +3887,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -5590,7 +5592,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -5602,7 +5605,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texteffects_565.png": {
"allowed-digests": [
@@ -6037,4 +6041,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json b/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json
index 6a3a4f5fd9..08d4d3d908 100644
--- a/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json
@@ -3874,7 +3874,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -3886,7 +3887,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -5590,7 +5592,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -5602,7 +5605,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texteffects_565.png": {
"allowed-digests": [
@@ -6037,4 +6041,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json b/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json
index 1d5ac2d744..90a5230c01 100644
--- a/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json
@@ -3874,7 +3874,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -3886,7 +3887,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -5590,7 +5592,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -5602,7 +5605,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texteffects_565.png": {
"allowed-digests": [
@@ -6037,4 +6041,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Release/expected-results.json b/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Release/expected-results.json
index 1d5ac2d744..90a5230c01 100644
--- a/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Release/expected-results.json
@@ -3874,7 +3874,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -3886,7 +3887,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -5590,7 +5592,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -5602,7 +5605,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texteffects_565.png": {
"allowed-digests": [
@@ -6037,4 +6041,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
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 bb02cd01ef..6c8e385de7 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
@@ -9527,7 +9527,8 @@
"bitmap-64bitMD5",
4820552830142034834
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -9535,7 +9536,8 @@
"bitmap-64bitMD5",
10137606906992849214
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -9543,7 +9545,8 @@
"bitmap-64bitMD5",
8004183534535355722
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-mac.png": {
"allowed-digests": [
@@ -9551,7 +9554,8 @@
"bitmap-64bitMD5",
5741308506239316783
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-poppler.png": {
"allowed-digests": [
@@ -9563,7 +9567,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -13780,7 +13785,7 @@
2449762981896068609
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -13789,7 +13794,7 @@
91395995868500721
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -13798,7 +13803,7 @@
4555034283268968588
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_mesa.png": {
"allowed-digests": [
@@ -13807,7 +13812,7 @@
2001564302804119674
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_msaa16.png": {
"allowed-digests": [
@@ -13816,7 +13821,7 @@
6475206245654802895
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_pdf-mac.png": {
"allowed-digests": [
@@ -13825,7 +13830,7 @@
15687720023335330811
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_pdf-poppler.png": {
"allowed-digests": [
@@ -13837,7 +13842,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -14907,4 +14913,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
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 90fcb99faf..f39e8493a5 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
@@ -8188,7 +8188,8 @@
"bitmap-64bitMD5",
4820552830142034834
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -8196,7 +8197,8 @@
"bitmap-64bitMD5",
10137606906992849214
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -8204,7 +8206,8 @@
"bitmap-64bitMD5",
8004183534535355722
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-mac.png": {
"allowed-digests": [
@@ -8212,7 +8215,8 @@
"bitmap-64bitMD5",
5741308506239316783
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -11892,7 +11896,7 @@
2449762981896068609
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -11901,7 +11905,7 @@
91395995868500721
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -11910,7 +11914,7 @@
4555034283268968588
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_mesa.png": {
"allowed-digests": [
@@ -11919,7 +11923,7 @@
2001564302804119674
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_msaa16.png": {
"allowed-digests": [
@@ -11928,7 +11932,7 @@
6475206245654802895
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_pdf-mac.png": {
"allowed-digests": [
@@ -11937,7 +11941,7 @@
15687720023335330811
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -12899,4 +12903,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
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 2c3ff52d8c..7344d882bd 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
@@ -9527,7 +9527,8 @@
"bitmap-64bitMD5",
4820552830142034834
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -9535,7 +9536,8 @@
"bitmap-64bitMD5",
10137606906992849214
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -9543,7 +9545,8 @@
"bitmap-64bitMD5",
8004183534535355722
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-mac.png": {
"allowed-digests": [
@@ -9551,7 +9554,8 @@
"bitmap-64bitMD5",
5741308506239316783
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-poppler.png": {
"allowed-digests": [
@@ -9563,7 +9567,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -13781,7 +13786,7 @@
2449762981896068609
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -13790,7 +13795,7 @@
91395995868500721
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -13799,7 +13804,7 @@
4555034283268968588
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_mesa.png": {
"allowed-digests": [
@@ -13808,7 +13813,7 @@
2001564302804119674
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_msaa16.png": {
"allowed-digests": [
@@ -13817,7 +13822,7 @@
6475206245654802895
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_pdf-mac.png": {
"allowed-digests": [
@@ -13826,7 +13831,7 @@
15687720023335330811
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_pdf-poppler.png": {
"allowed-digests": [
@@ -13838,7 +13843,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -14908,4 +14914,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
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 7dd7a5f584..9927ba695b 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
@@ -7900,7 +7900,8 @@
"bitmap-64bitMD5",
4820552830142034834
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -7908,7 +7909,8 @@
"bitmap-64bitMD5",
10137606906992849214
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -7916,7 +7918,8 @@
"bitmap-64bitMD5",
8004183534535355722
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-mac.png": {
"allowed-digests": [
@@ -7924,7 +7927,8 @@
"bitmap-64bitMD5",
5741308506239316783
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-poppler.png": {
"allowed-digests": [
@@ -7936,7 +7940,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -11545,7 +11550,7 @@
2449762981896068609
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -11554,7 +11559,7 @@
91395995868500721
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -11563,7 +11568,7 @@
4555034283268968588
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_mesa.png": {
"allowed-digests": [
@@ -11572,7 +11577,7 @@
2001564302804119674
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_msaa16.png": {
"allowed-digests": [
@@ -11581,7 +11586,7 @@
6475206245654802895
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_pdf-mac.png": {
"allowed-digests": [
@@ -11590,7 +11595,7 @@
15687720023335330811
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -12552,4 +12557,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
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 c2fc044a3a..ccc4d54027 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
@@ -9910,7 +9910,8 @@
"bitmap-64bitMD5",
2524338253018381328
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -9918,7 +9919,8 @@
"bitmap-64bitMD5",
12087951868014485958
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -9926,7 +9928,8 @@
"bitmap-64bitMD5",
17206709515863774772
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_mesa.png": {
"allowed-digests": [
@@ -9934,7 +9937,8 @@
"bitmap-64bitMD5",
11689026128422767692
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-mac.png": {
"allowed-digests": [
@@ -9942,7 +9946,8 @@
"bitmap-64bitMD5",
5741308506239316783
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-poppler.png": {
"allowed-digests": [
@@ -9954,7 +9959,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -14252,7 +14258,7 @@
2449762981896068609
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -14261,7 +14267,7 @@
91395995868500721
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -14270,7 +14276,7 @@
4555034283268968588
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_mesa.png": {
"allowed-digests": [
@@ -14279,7 +14285,7 @@
11994470484843641171
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_msaa16.png": {
"allowed-digests": [
@@ -14288,7 +14294,7 @@
6475206245654802895
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_pdf-mac.png": {
"allowed-digests": [
@@ -14297,7 +14303,7 @@
15599343203393787421
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_pdf-poppler.png": {
"allowed-digests": [
@@ -14309,7 +14315,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -15436,4 +15443,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
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 791afc1bcc..83e39c1096 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
@@ -8618,7 +8618,8 @@
"bitmap-64bitMD5",
2524338253018381328
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -8626,7 +8627,8 @@
"bitmap-64bitMD5",
12087951868014485958
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -8634,7 +8636,8 @@
"bitmap-64bitMD5",
17206709515863774772
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_mesa.png": {
"allowed-digests": [
@@ -8642,7 +8645,8 @@
"bitmap-64bitMD5",
11689026128422767692
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-mac.png": {
"allowed-digests": [
@@ -8650,7 +8654,8 @@
"bitmap-64bitMD5",
5741308506239316783
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -12459,7 +12464,7 @@
2449762981896068609
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -12468,7 +12473,7 @@
91395995868500721
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -12477,7 +12482,7 @@
4555034283268968588
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_mesa.png": {
"allowed-digests": [
@@ -12486,7 +12491,7 @@
11994470484843641171
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_msaa16.png": {
"allowed-digests": [
@@ -12495,7 +12500,7 @@
6475206245654802895
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_pdf-mac.png": {
"allowed-digests": [
@@ -12504,7 +12509,7 @@
15599343203393787421
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_pdf-poppler.png": {
"allowed-digests": [
@@ -12516,7 +12521,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -13523,4 +13529,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
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 fcda278af9..4e9ec1c9c9 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
@@ -9910,7 +9910,8 @@
"bitmap-64bitMD5",
2524338253018381328
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -9918,7 +9919,8 @@
"bitmap-64bitMD5",
12087951868014485958
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -9926,7 +9928,8 @@
"bitmap-64bitMD5",
17206709515863774772
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_mesa.png": {
"allowed-digests": [
@@ -9934,7 +9937,8 @@
"bitmap-64bitMD5",
11689026128422767692
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-mac.png": {
"allowed-digests": [
@@ -9942,7 +9946,8 @@
"bitmap-64bitMD5",
5741308506239316783
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-poppler.png": {
"allowed-digests": [
@@ -9954,7 +9959,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -14252,7 +14258,7 @@
2449762981896068609
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -14261,7 +14267,7 @@
91395995868500721
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -14270,7 +14276,7 @@
4555034283268968588
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_mesa.png": {
"allowed-digests": [
@@ -14279,7 +14285,7 @@
11994470484843641171
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_msaa16.png": {
"allowed-digests": [
@@ -14288,7 +14294,7 @@
6475206245654802895
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_pdf-mac.png": {
"allowed-digests": [
@@ -14297,7 +14303,7 @@
15599343203393787421
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_pdf-poppler.png": {
"allowed-digests": [
@@ -14309,7 +14315,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -15436,4 +15443,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
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 327243f777..6a3c573858 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
@@ -8330,7 +8330,8 @@
"bitmap-64bitMD5",
2524338253018381328
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -8338,7 +8339,8 @@
"bitmap-64bitMD5",
12087951868014485958
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -8346,7 +8348,8 @@
"bitmap-64bitMD5",
17206709515863774772
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_mesa.png": {
"allowed-digests": [
@@ -8354,7 +8357,8 @@
"bitmap-64bitMD5",
11689026128422767692
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-mac.png": {
"allowed-digests": [
@@ -8362,7 +8366,8 @@
"bitmap-64bitMD5",
5741308506239316783
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-poppler.png": {
"allowed-digests": [
@@ -8374,7 +8379,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -11991,7 +11997,7 @@
2449762981896068609
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -12000,7 +12006,7 @@
91395995868500721
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -12009,7 +12015,7 @@
4555034283268968588
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_mesa.png": {
"allowed-digests": [
@@ -12018,7 +12024,7 @@
11994470484843641171
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_msaa16.png": {
"allowed-digests": [
@@ -12027,7 +12033,7 @@
6475206245654802895
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_pdf-mac.png": {
"allowed-digests": [
@@ -12036,7 +12042,7 @@
15599343203393787421
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -13055,4 +13061,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/expected-results.json b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
index ab95470840..1d28b5b691 100644
--- a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Debug/expected-results.json
@@ -9653,7 +9653,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -9665,7 +9666,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -9677,7 +9679,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_pdf-mac.png": {
"allowed-digests": [
@@ -9689,7 +9692,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_pdf-poppler.png": {
"allowed-digests": [
@@ -9701,7 +9705,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -13937,7 +13942,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -13949,7 +13955,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -13961,7 +13968,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_pdf-mac.png": {
"allowed-digests": [
@@ -13973,7 +13981,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_pdf-poppler.png": {
"allowed-digests": [
@@ -13985,7 +13994,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -15128,4 +15138,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release/expected-results.json b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release/expected-results.json
index bf91758d58..e90d8ee5b9 100644
--- a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86-Release/expected-results.json
@@ -8381,7 +8381,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -8393,7 +8394,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_pdf-mac.png": {
"allowed-digests": [
@@ -8405,7 +8407,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_pdf-poppler.png": {
"allowed-digests": [
@@ -8417,7 +8420,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -12137,7 +12141,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -12149,7 +12154,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -12161,7 +12167,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_pdf-mac.png": {
"allowed-digests": [
@@ -12173,7 +12180,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -13208,4 +13216,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
index 07652f7abe..b32442edd4 100644
--- a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
@@ -9653,7 +9653,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -9665,7 +9666,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -9677,7 +9679,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_pdf-mac.png": {
"allowed-digests": [
@@ -9689,7 +9692,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_pdf-poppler.png": {
"allowed-digests": [
@@ -9701,7 +9705,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -13937,7 +13942,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -13949,7 +13955,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -13961,7 +13968,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_pdf-mac.png": {
"allowed-digests": [
@@ -13973,7 +13981,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_pdf-poppler.png": {
"allowed-digests": [
@@ -13985,7 +13994,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -15128,4 +15138,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
index bf31861aed..8f11fbb881 100644
--- a/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
@@ -8117,7 +8117,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -8129,7 +8130,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -8141,7 +8143,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_pdf-mac.png": {
"allowed-digests": [
@@ -8153,7 +8156,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -11753,7 +11757,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -11765,7 +11770,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -11777,7 +11783,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_pdf-mac.png": {
"allowed-digests": [
@@ -11789,7 +11796,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -12824,4 +12832,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug/expected-results.json
index 8585783d8a..03d82744f4 100644
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug/expected-results.json
@@ -7043,7 +7043,8 @@
"bitmap-64bitMD5",
3874425517424945040
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -7051,7 +7052,8 @@
"bitmap-64bitMD5",
6609487318995142418
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -7059,7 +7061,8 @@
"bitmap-64bitMD5",
7695122859919470395
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-poppler.png": {
"allowed-digests": [
@@ -7071,7 +7074,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -10109,7 +10113,7 @@
5103396618248609155
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -10118,7 +10122,7 @@
3389221874357470113
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -10127,7 +10131,7 @@
10341140275653193223
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_pdf-poppler.png": {
"allowed-digests": [
@@ -10139,7 +10143,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -10934,4 +10939,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Release/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Release/expected-results.json
index 1363b269bf..179cb585b7 100644
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86-Release/expected-results.json
@@ -7043,7 +7043,8 @@
"bitmap-64bitMD5",
3874425517424945040
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -7051,7 +7052,8 @@
"bitmap-64bitMD5",
6609487318995142418
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -7059,7 +7061,8 @@
"bitmap-64bitMD5",
7695122859919470395
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-poppler.png": {
"allowed-digests": [
@@ -7071,7 +7074,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -10109,7 +10113,7 @@
5103396618248609155
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -10118,7 +10122,7 @@
3389221874357470113
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -10127,7 +10131,7 @@
10341140275653193223
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_pdf-poppler.png": {
"allowed-digests": [
@@ -10139,7 +10143,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -10934,4 +10939,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Debug/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Debug/expected-results.json
index 6e2448d443..9328067e25 100644
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Debug/expected-results.json
@@ -7043,7 +7043,8 @@
"bitmap-64bitMD5",
3874425517424945040
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -7051,7 +7052,8 @@
"bitmap-64bitMD5",
6609487318995142418
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -7059,7 +7061,8 @@
"bitmap-64bitMD5",
7695122859919470395
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-poppler.png": {
"allowed-digests": [
@@ -7071,7 +7074,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -10110,7 +10114,7 @@
5103396618248609155
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -10119,7 +10123,7 @@
3389221874357470113
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -10128,7 +10132,7 @@
10341140275653193223
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_pdf-poppler.png": {
"allowed-digests": [
@@ -10140,7 +10144,7 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -10935,4 +10939,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/expected-results.json
index cf0bee9252..991f35a342 100644
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-ATI5770-x86_64-Release/expected-results.json
@@ -7043,7 +7043,8 @@
"bitmap-64bitMD5",
3874425517424945040
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -7051,7 +7052,8 @@
"bitmap-64bitMD5",
6609487318995142418
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -7059,7 +7061,8 @@
"bitmap-64bitMD5",
7695122859919470395
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-poppler.png": {
"allowed-digests": [
@@ -7071,7 +7074,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -10110,7 +10114,7 @@
5103396618248609155
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -10119,7 +10123,7 @@
3389221874357470113
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -10128,7 +10132,7 @@
10341140275653193223
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_pdf-poppler.png": {
"allowed-digests": [
@@ -10140,7 +10144,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -10935,4 +10940,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Ubuntu12-ShuttleA-NoGPU-x86_64-Debug/expected-results.json b/expectations/gm/Test-Ubuntu12-ShuttleA-NoGPU-x86_64-Debug/expected-results.json
index 87d4568e8f..b9028dc42c 100644
--- a/expectations/gm/Test-Ubuntu12-ShuttleA-NoGPU-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Ubuntu12-ShuttleA-NoGPU-x86_64-Debug/expected-results.json
@@ -6279,7 +6279,8 @@
"bitmap-64bitMD5",
3874425517424945040
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -6287,7 +6288,8 @@
"bitmap-64bitMD5",
6609487318995142418
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -6295,7 +6297,8 @@
"bitmap-64bitMD5",
7695122859919470395
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-poppler.png": {
"allowed-digests": [
@@ -6307,7 +6310,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -9005,7 +9009,7 @@
5103396618248609155
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -9014,7 +9018,7 @@
3389221874357470113
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -9023,7 +9027,7 @@
2850223770310157610
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_pdf-poppler.png": {
"allowed-digests": [
@@ -9035,7 +9039,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -9746,4 +9751,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Ubuntu13-ShuttleA-HD2000-x86_64-Debug-ASAN/expected-results.json b/expectations/gm/Test-Ubuntu13-ShuttleA-HD2000-x86_64-Debug-ASAN/expected-results.json
index 2c1cd01600..072997cf82 100644
--- a/expectations/gm/Test-Ubuntu13-ShuttleA-HD2000-x86_64-Debug-ASAN/expected-results.json
+++ b/expectations/gm/Test-Ubuntu13-ShuttleA-HD2000-x86_64-Debug-ASAN/expected-results.json
@@ -7739,7 +7739,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -7751,7 +7752,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -7763,7 +7765,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefilterscropped_pdf-poppler.png": {
"allowed-digests": [
@@ -7775,7 +7778,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -11171,7 +11175,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -11183,7 +11188,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -11195,7 +11201,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_pdf-poppler.png": {
"allowed-digests": [
@@ -11207,7 +11214,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -12122,4 +12130,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE/expected-results.json
index e5081d66b2..6b1a5076bf 100644
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE/expected-results.json
@@ -9411,7 +9411,8 @@
"bitmap-64bitMD5",
10267199484925399365
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -9419,7 +9420,8 @@
"bitmap-64bitMD5",
16225020407926229569
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_angle.png": {
"allowed-digests": [
@@ -9427,7 +9429,8 @@
"bitmap-64bitMD5",
15873738807574929761
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -9435,7 +9438,8 @@
"bitmap-64bitMD5",
9540626140949731992
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-poppler.png": {
"allowed-digests": [
@@ -9447,7 +9451,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -13551,7 +13556,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -13563,7 +13569,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_angle.png": {
"allowed-digests": [
@@ -13572,7 +13579,7 @@
2986097465932380981
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -13584,7 +13591,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_pdf-poppler.png": {
"allowed-digests": [
@@ -13596,7 +13604,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -14690,4 +14699,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite/expected-results.json
index 0176c36886..4044bf3cb8 100644
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-DirectWrite/expected-results.json
@@ -7098,7 +7098,8 @@
"bitmap-64bitMD5",
9665705870880200206
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -7106,7 +7107,8 @@
"bitmap-64bitMD5",
9280149324796697606
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -7114,7 +7116,8 @@
"bitmap-64bitMD5",
11886632383343158012
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-poppler.png": {
"allowed-digests": [
@@ -7126,7 +7129,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -10164,7 +10168,7 @@
2449762981896068609
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -10173,7 +10177,7 @@
91395995868500721
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -10194,7 +10198,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -10992,4 +10997,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
index 7f51deadf2..d5ce3edae0 100644
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
@@ -7086,7 +7086,8 @@
"bitmap-64bitMD5",
10267199484925399365
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -7094,7 +7095,8 @@
"bitmap-64bitMD5",
16225020407926229569
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -7102,7 +7104,8 @@
"bitmap-64bitMD5",
9540626140949731992
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-poppler.png": {
"allowed-digests": [
@@ -7114,7 +7117,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -10170,7 +10174,7 @@
2449762981896068609
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -10179,7 +10183,7 @@
91395995868500721
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -10200,7 +10204,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -10998,4 +11003,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json
index e5081d66b2..6b1a5076bf 100644
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json
@@ -9411,7 +9411,8 @@
"bitmap-64bitMD5",
10267199484925399365
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -9419,7 +9420,8 @@
"bitmap-64bitMD5",
16225020407926229569
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_angle.png": {
"allowed-digests": [
@@ -9427,7 +9429,8 @@
"bitmap-64bitMD5",
15873738807574929761
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -9435,7 +9438,8 @@
"bitmap-64bitMD5",
9540626140949731992
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-poppler.png": {
"allowed-digests": [
@@ -9447,7 +9451,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -13551,7 +13556,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -13563,7 +13569,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_angle.png": {
"allowed-digests": [
@@ -13572,7 +13579,7 @@
2986097465932380981
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -13584,7 +13591,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"testimagefilters_pdf-poppler.png": {
"allowed-digests": [
@@ -13596,7 +13604,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -14690,4 +14699,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/expected-results.json
index e7cd6c6c50..b4d3346007 100644
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-DirectWrite/expected-results.json
@@ -7098,7 +7098,8 @@
"bitmap-64bitMD5",
9665705870880200206
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -7106,7 +7107,8 @@
"bitmap-64bitMD5",
9280149324796697606
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -7114,7 +7116,8 @@
"bitmap-64bitMD5",
11886632383343158012
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-poppler.png": {
"allowed-digests": [
@@ -7126,7 +7129,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -10164,7 +10168,7 @@
2449762981896068609
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -10173,7 +10177,7 @@
91395995868500721
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -10194,7 +10198,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -10992,4 +10997,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
index 7f51deadf2..d5ce3edae0 100644
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json
@@ -7086,7 +7086,8 @@
"bitmap-64bitMD5",
10267199484925399365
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -7094,7 +7095,8 @@
"bitmap-64bitMD5",
16225020407926229569
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -7102,7 +7104,8 @@
"bitmap-64bitMD5",
9540626140949731992
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-poppler.png": {
"allowed-digests": [
@@ -7114,7 +7117,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -10170,7 +10174,7 @@
2449762981896068609
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -10179,7 +10183,7 @@
91395995868500721
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -10200,7 +10204,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -10998,4 +11003,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json
index d195c42fde..90fd392aae 100644
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json
@@ -7086,7 +7086,8 @@
"bitmap-64bitMD5",
10267199484925399365
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -7094,7 +7095,8 @@
"bitmap-64bitMD5",
16225020407926229569
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -7102,7 +7104,8 @@
"bitmap-64bitMD5",
9540626140949731992
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-poppler.png": {
"allowed-digests": [
@@ -7114,7 +7117,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -10170,7 +10174,7 @@
2449762981896068609
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -10179,7 +10183,7 @@
91395995868500721
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -10200,7 +10204,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -10998,4 +11003,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json
index d195c42fde..90fd392aae 100644
--- a/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json
+++ b/expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json
@@ -7086,7 +7086,8 @@
"bitmap-64bitMD5",
10267199484925399365
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_8888.png": {
"allowed-digests": [
@@ -7094,7 +7095,8 @@
"bitmap-64bitMD5",
16225020407926229569
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_gpu.png": {
"allowed-digests": [
@@ -7102,7 +7104,8 @@
"bitmap-64bitMD5",
9540626140949731992
]
- ]
+ ],
+ "ignore-failure": true
},
"imagefilterscropped_pdf-poppler.png": {
"allowed-digests": [
@@ -7114,7 +7117,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"imagefiltersgraph_565.png": {
"allowed-digests": [
@@ -10170,7 +10174,7 @@
2449762981896068609
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_8888.png": {
"allowed-digests": [
@@ -10179,7 +10183,7 @@
91395995868500721
]
],
- "ignore-failure": false
+ "ignore-failure": true
},
"testimagefilters_gpu.png": {
"allowed-digests": [
@@ -10200,7 +10204,8 @@
"bugs": [
1578
],
- "reviewed-by-human": false
+ "reviewed-by-human": false,
+ "ignore-failure": true
},
"texdata_565.png": {
"allowed-digests": [
@@ -10998,4 +11003,4 @@
"reviewed-by-human": false
}
}
-} \ No newline at end of file
+}
diff --git a/gm/imagefilterscropped.cpp b/gm/imagefilterscropped.cpp
index b21131c362..767973d07d 100644
--- a/gm/imagefilterscropped.cpp
+++ b/gm/imagefilterscropped.cpp
@@ -13,6 +13,8 @@
#include "SkBlurImageFilter.h"
#include "SkColorFilterImageFilter.h"
+#include "SkMergeImageFilter.h"
+#include "SkOffsetImageFilter.h"
#include "SkTestImageFilters.h"
///////////////////////////////////////////////////////////////////////////////
@@ -129,22 +131,27 @@ protected:
draw_sprite, draw_bitmap, draw_path, draw_paint, draw_text
};
- SkColorFilter* cf = SkColorFilter::CreateModeFilter(SK_ColorRED,
- SkXfermode::kSrcIn_Mode);
+ SkAutoTUnref<SkColorFilter> cf(
+ SkColorFilter::CreateModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_Mode));
SkIRect cropRect = SkIRect::MakeXYWH(10, 10, 44, 44);
SkIRect bogusRect = SkIRect::MakeXYWH(-100, -100, 10, 10);
+ SkAutoTUnref<SkImageFilter> offset(new SkOffsetImageFilter(
+ SkIntToScalar(-10), SkIntToScalar(-10)));
+
+ SkAutoTUnref<SkImageFilter> cfOffset(SkColorFilterImageFilter::Create(cf.get(), offset.get()));
+
SkImageFilter* filters[] = {
NULL,
- SkColorFilterImageFilter::Create(cf, NULL, &cropRect),
+ SkColorFilterImageFilter::Create(cf.get(), NULL, &cropRect),
new SkBlurImageFilter(1.0f, 1.0f, NULL, &cropRect),
new SkBlurImageFilter(8.0f, 0.0f, NULL, &cropRect),
new SkBlurImageFilter(0.0f, 8.0f, NULL, &cropRect),
new SkBlurImageFilter(8.0f, 8.0f, NULL, &cropRect),
+ new SkMergeImageFilter(NULL, cfOffset.get(), SkXfermode::kSrcOver_Mode, &cropRect),
new SkBlurImageFilter(8.0f, 8.0f, NULL, &bogusRect),
- SkColorFilterImageFilter::Create(cf, NULL, &bogusRect),
+ SkColorFilterImageFilter::Create(cf.get(), NULL, &bogusRect),
};
- cf->unref();
SkRect r = SkRect::MakeWH(SkIntToScalar(64), SkIntToScalar(64));
SkScalar MARGIN = SkIntToScalar(16);
diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h
index 8c4313dd13..310c6cd3ac 100755
--- a/include/effects/SkMergeImageFilter.h
+++ b/include/effects/SkMergeImageFilter.h
@@ -15,9 +15,11 @@
class SK_API SkMergeImageFilter : public SkImageFilter {
public:
SkMergeImageFilter(SkImageFilter* first, SkImageFilter* second,
- SkXfermode::Mode = SkXfermode::kSrcOver_Mode);
+ SkXfermode::Mode = SkXfermode::kSrcOver_Mode,
+ const SkIRect* cropRect = NULL);
SkMergeImageFilter(SkImageFilter* filters[], int count,
- const SkXfermode::Mode modes[] = NULL);
+ const SkXfermode::Mode modes[] = NULL,
+ const SkIRect* cropRect = NULL);
virtual ~SkMergeImageFilter();
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMergeImageFilter)
diff --git a/src/effects/SkMergeImageFilter.cpp b/src/effects/SkMergeImageFilter.cpp
index 0c47c91aff..020533046d 100755
--- a/src/effects/SkMergeImageFilter.cpp
+++ b/src/effects/SkMergeImageFilter.cpp
@@ -39,7 +39,8 @@ void SkMergeImageFilter::initModes(const SkXfermode::Mode modes[]) {
}
SkMergeImageFilter::SkMergeImageFilter(SkImageFilter* first, SkImageFilter* second,
- SkXfermode::Mode mode) : INHERITED(first, second) {
+ SkXfermode::Mode mode,
+ const SkIRect* cropRect) : INHERITED(first, second, cropRect) {
if (SkXfermode::kSrcOver_Mode != mode) {
SkXfermode::Mode modes[] = { mode, mode };
this->initModes(modes);
@@ -49,7 +50,8 @@ SkMergeImageFilter::SkMergeImageFilter(SkImageFilter* first, SkImageFilter* seco
}
SkMergeImageFilter::SkMergeImageFilter(SkImageFilter* filters[], int count,
- const SkXfermode::Mode modes[]) : INHERITED(count, filters) {
+ const SkXfermode::Mode modes[],
+ const SkIRect* cropRect) : INHERITED(count, filters, cropRect) {
this->initModes(modes);
}
@@ -99,10 +101,9 @@ bool SkMergeImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src,
return false;
}
- const SkIRect srcBounds = SkIRect::MakeXYWH(loc->x(), loc->y(),
- src.width(), src.height());
SkIRect bounds;
- if (!this->filterBounds(srcBounds, ctm, &bounds)) {
+ src.getBounds(&bounds);
+ if (!this->applyCropRect(&bounds, ctm)) {
return false;
}
@@ -120,7 +121,7 @@ bool SkMergeImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src,
for (int i = 0; i < inputCount; ++i) {
SkBitmap tmp;
const SkBitmap* srcPtr;
- SkIPoint pos = *loc;
+ SkIPoint pos = SkIPoint::Make(0, 0);
SkImageFilter* filter = getInput(i);
if (filter) {
if (!filter->filterImage(proxy, src, ctm, &tmp, &pos)) {
@@ -139,7 +140,8 @@ bool SkMergeImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src,
canvas.drawSprite(*srcPtr, pos.x() - x0, pos.y() - y0, &paint);
}
- loc->set(bounds.left(), bounds.top());
+ loc->fX += bounds.left();
+ loc->fY += bounds.top();
*result = dst->accessBitmap(false);
return true;
}