Skip to content

GitLab

T
tangled
Commit 83c73530 authored by Reza.Zakerinasab's avatar Reza.Zakerinasab Committed by Commit Bot
Browse files
Options

Fix ImageBitmapColorSpaceConversionImageData crash on asan-clang-phone 

This change fixes the ASAN crash on clang-phone bot.

TBR=junov@chromium.org

Bug: 779533
Change-Id: Ia69bd71bb7845e87609550f0b6889445fa27eb60
Reviewed-on: https://chromium-review.googlesource.com/747564Reviewed-by: default avatarMohammad Reza Zakerinasab <zakerinasab@chromium.org>
Reviewed-by: default avatarFernando Serboncini <fserb@chromium.org>
Commit-Queue: Mohammad Reza Zakerinasab <zakerinasab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#512924}
parent e38e621b
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
third_party/WebKit/Source/core/imagebitmap/ImageBitmapTest.cpp
View file @ 83c73530
...@@ -364,8 +364,8 @@ TEST_F(ImageBitmapTest, MAYBE_ImageBitmapColorSpaceConversionHTMLImageElement) { ...@@ -364,8 +364,8 @@ TEST_F(ImageBitmapTest, MAYBE_ImageBitmapColorSpaceConversionHTMLImageElement) {
ColorCorrectionTestUtils::CompareColorCorrectedPixels( ColorCorrectionTestUtils::CompareColorCorrectedPixels(
converted_pixel.get(), transformed_pixel.get(), 1, converted_pixel.get(), transformed_pixel.get(), 1,
(color_type == kBGRA_8888_SkColorType) ? kUint8ClampedArrayStorageFormat (color_type == kN32_SkColorType) ? kUint8ClampedArrayStorageFormat
: kUint16ArrayStorageFormat, : kUint16ArrayStorageFormat,
kAlphaMultiplied, kUnpremulRoundTripTolerance); kAlphaMultiplied, kUnpremulRoundTripTolerance);
} }
} }
...@@ -486,8 +486,8 @@ TEST_F(ImageBitmapTest, MAYBE_ImageBitmapColorSpaceConversionImageBitmap) { ...@@ -486,8 +486,8 @@ TEST_F(ImageBitmapTest, MAYBE_ImageBitmapColorSpaceConversionImageBitmap) {
ColorCorrectionTestUtils::CompareColorCorrectedPixels( ColorCorrectionTestUtils::CompareColorCorrectedPixels(
converted_pixel.get(), transformed_pixel.get(), 1, converted_pixel.get(), transformed_pixel.get(), 1,
(color_type == kBGRA_8888_SkColorType) ? kUint8ClampedArrayStorageFormat (color_type == kN32_SkColorType) ? kUint8ClampedArrayStorageFormat
: kUint16ArrayStorageFormat, : kUint16ArrayStorageFormat,
kAlphaMultiplied, kUnpremulRoundTripTolerance); kAlphaMultiplied, kUnpremulRoundTripTolerance);
} }
} }
...@@ -602,8 +602,8 @@ TEST_F(ImageBitmapTest, ...@@ -602,8 +602,8 @@ TEST_F(ImageBitmapTest,
ColorCorrectionTestUtils::CompareColorCorrectedPixels( ColorCorrectionTestUtils::CompareColorCorrectedPixels(
converted_pixel.get(), transformed_pixel.get(), 1, converted_pixel.get(), transformed_pixel.get(), 1,
(color_type == kBGRA_8888_SkColorType) ? kUint8ClampedArrayStorageFormat (color_type == kN32_SkColorType) ? kUint8ClampedArrayStorageFormat
: kUint16ArrayStorageFormat, : kUint16ArrayStorageFormat,
kAlphaMultiplied, unpremul_round_trip_tolerance); kAlphaMultiplied, unpremul_round_trip_tolerance);
} }
} }
...@@ -698,8 +698,8 @@ TEST_F(ImageBitmapTest, ImageBitmapColorSpaceConversionImageData) { ...@@ -698,8 +698,8 @@ TEST_F(ImageBitmapTest, ImageBitmapColorSpaceConversionImageData) {
ColorCorrectionTestUtils::CompareColorCorrectedPixels( ColorCorrectionTestUtils::CompareColorCorrectedPixels(
converted_pixel.get(), transformed_pixel.get(), 1, converted_pixel.get(), transformed_pixel.get(), 1,
(color_type == kBGRA_8888_SkColorType) ? kUint8ClampedArrayStorageFormat (color_type == kN32_SkColorType) ? kUint8ClampedArrayStorageFormat
: kUint16ArrayStorageFormat, : kUint16ArrayStorageFormat,
kAlphaUnmultiplied, kUnpremulRoundTripTolerance); kAlphaUnmultiplied, kUnpremulRoundTripTolerance);
} }
} }
......
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