| Index: cc/trees/layer_tree_host_pixeltest_tiles.cc
|
| diff --git a/cc/trees/layer_tree_host_pixeltest_tiles.cc b/cc/trees/layer_tree_host_pixeltest_tiles.cc
|
| index 67342e2115120d01d8e0f45447aa13503516660c..3f5403dce79b66bc4a8895122b6cdca0bce8d6d5 100644
|
| --- a/cc/trees/layer_tree_host_pixeltest_tiles.cc
|
| +++ b/cc/trees/layer_tree_host_pixeltest_tiles.cc
|
| @@ -181,15 +181,30 @@ class LayerTreeHostTilesTestPartialInvalidation
|
| scoped_refptr<PictureLayer> picture_layer_;
|
| };
|
|
|
| +// Fails flakily on Linux ASan (http://crbug.com/645898).
|
| +#if defined(OS_LINUX) && defined(ADDRESS_SANITIZER)
|
| +#define MAYBE_PartialRaster_SingleThread_OneCopy \
|
| + DISABLED_PartialRaster_SingleThread_OneCopy
|
| +#else
|
| +#define MAYBE_PartialRaster_SingleThread_OneCopy \
|
| + PartialRaster_SingleThread_OneCopy
|
| +#endif
|
| TEST_F(LayerTreeHostTilesTestPartialInvalidation,
|
| - PartialRaster_SingleThread_OneCopy) {
|
| + MAYBE_PartialRaster_SingleThread_OneCopy) {
|
| RunRasterPixelTest(
|
| false, PARTIAL_ONE_COPY, picture_layer_,
|
| base::FilePath(FILE_PATH_LITERAL("blue_yellow_partial_flipped.png")));
|
| }
|
|
|
| +// Fails flakily on Linux ASan (http://crbug.com/645898).
|
| +#if defined(OS_LINUX) && defined(ADDRESS_SANITIZER)
|
| +#define MAYBE_FullRaster_SingleThread_OneCopy \
|
| + DISABLED_FullRaster_SingleThread_OneCopy
|
| +#else
|
| +#define MAYBE_FullRaster_SingleThread_OneCopy FullRaster_SingleThread_OneCopy
|
| +#endif
|
| TEST_F(LayerTreeHostTilesTestPartialInvalidation,
|
| - FullRaster_SingleThread_OneCopy) {
|
| + MAYBE_FullRaster_SingleThread_OneCopy) {
|
| RunRasterPixelTest(
|
| false, FULL_ONE_COPY, picture_layer_,
|
| base::FilePath(FILE_PATH_LITERAL("blue_yellow_flipped.png")));
|
|
|