Commit 5775961d authored by Brian Sheedy's avatar Brian Sheedy Committed by Commit Bot

Update GPU Pixel_CSSFilterEffects parameters

Updates the matching algorithm parameters for the GPU
Pixel_CSSFilterEffects tests, as the old parameters were too strict to
properly handle certain noisy configurations.

The new algorithm is a pure fuzzy matching algorithm instead of a
Sobel filter algorithm, as the large number of gradients and blurs in
the image were not playing nicely with the Sobel filter.

TBR=ynovikov@chromium.org

Bug: 1087740
Change-Id: I50d9cf37dde97d215af8436a801cf0e5555bbc4e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2222860Reviewed-by: default avatarBrian Sheedy <bsheedy@chromium.org>
Reviewed-by: default avatarYuly Novikov <ynovikov@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#773404}
parent 2c8708db
...@@ -990,60 +990,58 @@ class PixelTestPages(object): ...@@ -990,60 +990,58 @@ class PixelTestPages(object):
# WebGL's back buffer. # WebGL's back buffer.
no_overlays_args = ['--disable-mac-overlays'] no_overlays_args = ['--disable-mac-overlays']
# The filter effect tests produce images with lots of gradients and blurs
# which don't play nicely with Sobel filters, so a fuzzy algorithm instead
# of Sobel. The images are also relatively large (360k pixels), and large
# portions of the image are prone to noise, hence the large max different
# pixels value.
filter_effect_fuzzy_algo = algo.FuzzyMatchingAlgorithm(
max_different_pixels=57500, pixel_delta_threshold=10)
return [ return [
# On macOS, test the IOSurface 2D Canvas compositing path. # On macOS, test the IOSurface 2D Canvas compositing path.
PixelTestPage( PixelTestPage('pixel_canvas2d_accelerated.html',
'pixel_canvas2d_accelerated.html', base_name + '_IOSurface2DCanvas',
base_name + '_IOSurface2DCanvas', test_rect=[0, 0, 400, 400],
test_rect=[0, 0, 400, 400], browser_args=iosurface_2d_canvas_args),
browser_args=iosurface_2d_canvas_args), PixelTestPage('pixel_canvas2d_webgl.html',
PixelTestPage( base_name + '_IOSurface2DCanvasWebGL',
'pixel_canvas2d_webgl.html', test_rect=[0, 0, 300, 300],
base_name + '_IOSurface2DCanvasWebGL', browser_args=iosurface_2d_canvas_args),
test_rect=[0, 0, 300, 300],
browser_args=iosurface_2d_canvas_args),
# On macOS, test WebGL non-Chromium Image compositing path. # On macOS, test WebGL non-Chromium Image compositing path.
PixelTestPage( PixelTestPage('pixel_webgl_aa_alpha.html',
'pixel_webgl_aa_alpha.html', base_name +
base_name + '_WebGLGreenTriangle_NonChromiumImage_AA_Alpha', '_WebGLGreenTriangle_NonChromiumImage_AA_Alpha',
test_rect=[0, 0, 300, 300], test_rect=[0, 0, 300, 300],
browser_args=non_chromium_image_args), browser_args=non_chromium_image_args),
PixelTestPage( PixelTestPage('pixel_webgl_noaa_alpha.html',
'pixel_webgl_noaa_alpha.html', base_name +
base_name + '_WebGLGreenTriangle_NonChromiumImage_NoAA_Alpha', '_WebGLGreenTriangle_NonChromiumImage_NoAA_Alpha',
test_rect=[0, 0, 300, 300], test_rect=[0, 0, 300, 300],
browser_args=non_chromium_image_args), browser_args=non_chromium_image_args),
PixelTestPage( PixelTestPage('pixel_webgl_aa_noalpha.html',
'pixel_webgl_aa_noalpha.html', base_name +
base_name + '_WebGLGreenTriangle_NonChromiumImage_AA_NoAlpha', '_WebGLGreenTriangle_NonChromiumImage_AA_NoAlpha',
test_rect=[0, 0, 300, 300], test_rect=[0, 0, 300, 300],
browser_args=non_chromium_image_args), browser_args=non_chromium_image_args),
PixelTestPage( PixelTestPage('pixel_webgl_noaa_noalpha.html',
'pixel_webgl_noaa_noalpha.html', base_name +
base_name + '_WebGLGreenTriangle_NonChromiumImage_NoAA_NoAlpha', '_WebGLGreenTriangle_NonChromiumImage_NoAA_NoAlpha',
test_rect=[0, 0, 300, 300], test_rect=[0, 0, 300, 300],
browser_args=non_chromium_image_args), browser_args=non_chromium_image_args),
# On macOS, test CSS filter effects with and without the CA compositor. # On macOS, test CSS filter effects with and without the CA compositor.
PixelTestPage( PixelTestPage('filter_effects.html',
'filter_effects.html', base_name + '_CSSFilterEffects',
base_name + '_CSSFilterEffects', test_rect=[0, 0, 300, 300],
test_rect=[0, 0, 300, 300], matching_algorithm=filter_effect_fuzzy_algo),
matching_algorithm=algo.SobelMatchingAlgorithm( PixelTestPage('filter_effects.html',
max_different_pixels=10, base_name + '_CSSFilterEffects_NoOverlays',
pixel_delta_threshold=5, test_rect=[0, 0, 300, 300],
edge_threshold=245)), tolerance=10,
PixelTestPage( browser_args=no_overlays_args,
'filter_effects.html', matching_algorithm=filter_effect_fuzzy_algo),
base_name + '_CSSFilterEffects_NoOverlays',
test_rect=[0, 0, 300, 300],
tolerance=10,
browser_args=no_overlays_args,
matching_algorithm=algo.SobelMatchingAlgorithm(
max_different_pixels=240,
pixel_delta_threshold=5,
edge_threshold=250)),
# Test WebGL's premultipliedAlpha:false without the CA compositor. # Test WebGL's premultipliedAlpha:false without the CA compositor.
PixelTestPage( PixelTestPage(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment