Commit ee610e7a authored by Andreas Haas's avatar Andreas Haas Committed by Commit Bot

[canvas] Replace uses of deprecatedLengthAsUnsigned in tests

I changed the tests to use size_t instead of unsigned.

R=haraken@chromium.org

Bug: chromium:1008840
Change-Id: Id1aff0ebd014ce0e601e860aca85da9c369c959c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1975917Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Commit-Queue: Andreas Haas <ahaas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726362}
parent 48e041d7
...@@ -172,14 +172,14 @@ TEST_F(ImageDataTest, TestGetImageDataInCanvasColorSettings) { ...@@ -172,14 +172,14 @@ TEST_F(ImageDataTest, TestGetImageDataInCanvasColorSettings) {
0, 0, 0, 0, // Transparent 0, 0, 0, 0, // Transparent
255, 192, 128, 64, // Decreasing values 255, 192, 128, 64, // Decreasing values
93, 117, 205, 11}; // Random values 93, 117, 205, 11}; // Random values
unsigned data_length = 16; size_t data_length = 16;
uint16_t* u16_pixels = new uint16_t[data_length]; uint16_t* u16_pixels = new uint16_t[data_length];
for (unsigned i = 0; i < data_length; i++) for (size_t i = 0; i < data_length; i++)
u16_pixels[i] = u8_pixels[i] * 257; u16_pixels[i] = u8_pixels[i] * 257;
float* f32_pixels = new float[data_length]; float* f32_pixels = new float[data_length];
for (unsigned i = 0; i < data_length; i++) for (size_t i = 0; i < data_length; i++)
f32_pixels[i] = u8_pixels[i] / 255.0; f32_pixels[i] = u8_pixels[i] / 255.0;
DOMArrayBufferView* data_array = nullptr; DOMArrayBufferView* data_array = nullptr;
...@@ -187,13 +187,13 @@ TEST_F(ImageDataTest, TestGetImageDataInCanvasColorSettings) { ...@@ -187,13 +187,13 @@ TEST_F(ImageDataTest, TestGetImageDataInCanvasColorSettings) {
DOMUint8ClampedArray* data_u8 = DOMUint8ClampedArray* data_u8 =
DOMUint8ClampedArray::Create(u8_pixels, data_length); DOMUint8ClampedArray::Create(u8_pixels, data_length);
DCHECK(data_u8); DCHECK(data_u8);
EXPECT_EQ(data_length, data_u8->deprecatedLengthAsUnsigned()); EXPECT_EQ(data_length, data_u8->lengthAsSizeT());
DOMUint16Array* data_u16 = DOMUint16Array::Create(u16_pixels, data_length); DOMUint16Array* data_u16 = DOMUint16Array::Create(u16_pixels, data_length);
DCHECK(data_u16); DCHECK(data_u16);
EXPECT_EQ(data_length, data_u16->deprecatedLengthAsUnsigned()); EXPECT_EQ(data_length, data_u16->lengthAsSizeT());
DOMFloat32Array* data_f32 = DOMFloat32Array::Create(f32_pixels, data_length); DOMFloat32Array* data_f32 = DOMFloat32Array::Create(f32_pixels, data_length);
DCHECK(data_f32); DCHECK(data_f32);
EXPECT_EQ(data_length, data_f32->deprecatedLengthAsUnsigned()); EXPECT_EQ(data_length, data_f32->lengthAsSizeT());
ImageData* image_data = nullptr; ImageData* image_data = nullptr;
ImageDataColorSettings* color_settings = ImageDataColorSettings::Create(); ImageDataColorSettings* color_settings = ImageDataColorSettings::Create();
...@@ -395,7 +395,7 @@ TEST_F(ImageDataTest, TestCropRect) { ...@@ -395,7 +395,7 @@ TEST_F(ImageDataTest, TestCropRect) {
// Source pixels // Source pixels
unsigned width = 20; unsigned width = 20;
unsigned height = 20; unsigned height = 20;
unsigned data_length = width * height * 4; size_t data_length = width * height * 4;
uint8_t* u8_pixels = new uint8_t[data_length]; uint8_t* u8_pixels = new uint8_t[data_length];
uint16_t* u16_pixels = new uint16_t[data_length]; uint16_t* u16_pixels = new uint16_t[data_length];
float* f32_pixels = new float[data_length]; float* f32_pixels = new float[data_length];
...@@ -432,13 +432,13 @@ TEST_F(ImageDataTest, TestCropRect) { ...@@ -432,13 +432,13 @@ TEST_F(ImageDataTest, TestCropRect) {
DOMUint8ClampedArray* data_u8 = DOMUint8ClampedArray* data_u8 =
DOMUint8ClampedArray::Create(u8_pixels, data_length); DOMUint8ClampedArray::Create(u8_pixels, data_length);
DCHECK(data_u8); DCHECK(data_u8);
EXPECT_EQ(data_length, data_u8->deprecatedLengthAsUnsigned()); EXPECT_EQ(data_length, data_u8->lengthAsSizeT());
DOMUint16Array* data_u16 = DOMUint16Array::Create(u16_pixels, data_length); DOMUint16Array* data_u16 = DOMUint16Array::Create(u16_pixels, data_length);
DCHECK(data_u16); DCHECK(data_u16);
EXPECT_EQ(data_length, data_u16->deprecatedLengthAsUnsigned()); EXPECT_EQ(data_length, data_u16->lengthAsSizeT());
DOMFloat32Array* data_f32 = DOMFloat32Array::Create(f32_pixels, data_length); DOMFloat32Array* data_f32 = DOMFloat32Array::Create(f32_pixels, data_length);
DCHECK(data_f32); DCHECK(data_f32);
EXPECT_EQ(data_length, data_f32->deprecatedLengthAsUnsigned()); EXPECT_EQ(data_length, data_f32->lengthAsSizeT());
ImageData* image_data = nullptr; ImageData* image_data = nullptr;
ImageData* cropped_image_data = nullptr; ImageData* cropped_image_data = nullptr;
......
...@@ -994,14 +994,14 @@ void TestPutImageDataOnCanvasWithColorSpaceSettings( ...@@ -994,14 +994,14 @@ void TestPutImageDataOnCanvasWithColorSpaceSettings(
0, 0, 0, 0, // Transparent 0, 0, 0, 0, // Transparent
255, 192, 128, 64, // Decreasing values 255, 192, 128, 64, // Decreasing values
93, 117, 205, 41}; // Random values 93, 117, 205, 41}; // Random values
unsigned data_length = 16; size_t data_length = 16;
uint16_t* u16_pixels = new uint16_t[data_length]; uint16_t* u16_pixels = new uint16_t[data_length];
for (unsigned i = 0; i < data_length; i++) for (size_t i = 0; i < data_length; i++)
u16_pixels[i] = u8_pixels[i] * 257; u16_pixels[i] = u8_pixels[i] * 257;
float* f32_pixels = new float[data_length]; float* f32_pixels = new float[data_length];
for (unsigned i = 0; i < data_length; i++) for (size_t i = 0; i < data_length; i++)
f32_pixels[i] = u8_pixels[i] / 255.0; f32_pixels[i] = u8_pixels[i] / 255.0;
DOMArrayBufferView* data_array = nullptr; DOMArrayBufferView* data_array = nullptr;
...@@ -1009,13 +1009,13 @@ void TestPutImageDataOnCanvasWithColorSpaceSettings( ...@@ -1009,13 +1009,13 @@ void TestPutImageDataOnCanvasWithColorSpaceSettings(
DOMUint8ClampedArray* data_u8 = DOMUint8ClampedArray* data_u8 =
DOMUint8ClampedArray::Create(u8_pixels, data_length); DOMUint8ClampedArray::Create(u8_pixels, data_length);
DCHECK(data_u8); DCHECK(data_u8);
EXPECT_EQ(data_length, data_u8->deprecatedLengthAsUnsigned()); EXPECT_EQ(data_length, data_u8->lengthAsSizeT());
DOMUint16Array* data_u16 = DOMUint16Array::Create(u16_pixels, data_length); DOMUint16Array* data_u16 = DOMUint16Array::Create(u16_pixels, data_length);
DCHECK(data_u16); DCHECK(data_u16);
EXPECT_EQ(data_length, data_u16->deprecatedLengthAsUnsigned()); EXPECT_EQ(data_length, data_u16->lengthAsSizeT());
DOMFloat32Array* data_f32 = DOMFloat32Array::Create(f32_pixels, data_length); DOMFloat32Array* data_f32 = DOMFloat32Array::Create(f32_pixels, data_length);
DCHECK(data_f32); DCHECK(data_f32);
EXPECT_EQ(data_length, data_f32->deprecatedLengthAsUnsigned()); EXPECT_EQ(data_length, data_f32->lengthAsSizeT());
ImageData* image_data = nullptr; ImageData* image_data = nullptr;
ImageDataColorSettings* color_settings = ImageDataColorSettings::Create(); ImageDataColorSettings* color_settings = ImageDataColorSettings::Create();
......
...@@ -194,7 +194,7 @@ void ColorCorrectionTestUtils::CompareColorCorrectedPixels( ...@@ -194,7 +194,7 @@ void ColorCorrectionTestUtils::CompareColorCorrectedPixels(
bool ColorCorrectionTestUtils::ConvertPixelsToColorSpaceAndPixelFormatForTest( bool ColorCorrectionTestUtils::ConvertPixelsToColorSpaceAndPixelFormatForTest(
void* src_data, void* src_data,
int num_elements, size_t num_elements,
CanvasColorSpace src_color_space, CanvasColorSpace src_color_space,
ImageDataStorageFormat src_storage_format, ImageDataStorageFormat src_storage_format,
CanvasColorSpace dst_color_space, CanvasColorSpace dst_color_space,
......
...@@ -65,7 +65,7 @@ class ColorCorrectionTestUtils { ...@@ -65,7 +65,7 @@ class ColorCorrectionTestUtils {
static bool ConvertPixelsToColorSpaceAndPixelFormatForTest( static bool ConvertPixelsToColorSpaceAndPixelFormatForTest(
void* src_data, void* src_data,
int num_elements, size_t num_elements,
CanvasColorSpace src_color_space, CanvasColorSpace src_color_space,
ImageDataStorageFormat src_storage_format, ImageDataStorageFormat src_storage_format,
CanvasColorSpace dst_color_space, CanvasColorSpace dst_color_space,
......
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