Commit 6de28e70 authored by Philip Rogers's avatar Philip Rogers Committed by Commit Bot

Replace Lenna with Grace Hopper

This patch replaces "Lenna" images with images of Grace Hopper.

Bug: 1099702
Change-Id: I32cf958bd2b6fbef5388da24de846a90ac0af9bb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2270110
Auto-Submit: Philip Rogers <pdr@chromium.org>
Commit-Queue: Chris Harrelson <chrishtr@chromium.org>
Reviewed-by: default avatarChris Harrelson <chrishtr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#782985}
parent e9ff4517
......@@ -848,7 +848,7 @@ const DecodedImageTypeHistogramTest::ParamType
{"animated-10color.gif", BitmapImageMetrics::kImageGIF},
{"webp-color-profile-lossy.webp", BitmapImageMetrics::kImageWebP},
{"wrong-frame-dimensions.ico", BitmapImageMetrics::kImageICO},
{"lenna.bmp", BitmapImageMetrics::kImageBMP},
{"gracehopper.bmp", BitmapImageMetrics::kImageBMP},
#if BUILDFLAG(ENABLE_AV1_DECODER)
{"red-full-ranged-8bpc.avif", BitmapImageMetrics::kImageAVIF},
#endif
......
......@@ -85,7 +85,7 @@ TEST(DeferredImageDecoderTestWoPlatform, mixImagesWebp) {
}
TEST(DeferredImageDecoderTestWoPlatform, mixImagesBmp) {
MixImages("/images/resources/lenna.bmp", 122u, 0u);
MixImages("/images/resources/gracehopper.bmp", 122u, 0u);
}
TEST(DeferredImageDecoderTestWoPlatform, mixImagesIco) {
......@@ -98,7 +98,7 @@ TEST(DeferredImageDecoderTestWoPlatform, fragmentedSignature) {
"/images/resources/mu.png",
"/images/resources/2-dht.jpg",
"/images/resources/webp-animated.webp",
"/images/resources/lenna.bmp",
"/images/resources/gracehopper.bmp",
"/images/resources/wrong-frame-dimensions.ico",
};
......
......@@ -23,7 +23,8 @@ std::unique_ptr<ImageDecoder> CreateBMPDecoder() {
} // anonymous namespace
TEST(BMPImageDecoderTest, isSizeAvailable) {
static constexpr char kBmpFile[] = "/images/resources/lenna.bmp"; // 256x256
// This image is 256x256.
static constexpr char kBmpFile[] = "/images/resources/gracehopper.bmp";
scoped_refptr<SharedBuffer> data = ReadFile(kBmpFile);
ASSERT_TRUE(data.get());
......@@ -35,7 +36,8 @@ TEST(BMPImageDecoderTest, isSizeAvailable) {
}
TEST(BMPImageDecoderTest, parseAndDecode) {
static constexpr char kBmpFile[] = "/images/resources/lenna.bmp"; // 256x256
// This image is 256x256.
static constexpr char kBmpFile[] = "/images/resources/gracehopper.bmp";
scoped_refptr<SharedBuffer> data = ReadFile(kBmpFile);
ASSERT_TRUE(data.get());
......@@ -81,7 +83,7 @@ TEST(BMPImageDecoderTest, int32MinHeight) {
// size (when BMPImageDecoder stops while it may still have input data to
// read) and a call to do a full decode.
TEST(BMPImageDecoderTest, mergeBuffer) {
static constexpr char kBmpFile[] = "/images/resources/lenna.bmp";
static constexpr char kBmpFile[] = "/images/resources/gracehopper.bmp";
TestMergeBuffer(&CreateBMPDecoder, kBmpFile);
}
......
......@@ -153,7 +153,7 @@ TEST(JPEGImageDecoderTest, tooBig) {
// multiples of 8, to ensure we compute the correct DecodedSize and pass correct
// parameters to libjpeg to output the image with the expected size.
TEST(JPEGImageDecoderTest, downsampleImageSizeMultipleOf8) {
const char* jpeg_file = "/images/resources/lenna.jpg"; // 256x256
const char* jpeg_file = "/images/resources/gracehopper.jpg"; // 256x256
unsigned output_width, output_height;
// 1/8 downsample.
......@@ -236,7 +236,7 @@ TEST(JPEGImageDecoderTest, downsampleImageSizeNotMultipleOf8) {
// Tests that upsampling is not allowed.
TEST(JPEGImageDecoderTest, upsample) {
const char* jpeg_file = "/images/resources/lenna.jpg"; // 256x256
const char* jpeg_file = "/images/resources/gracehopper.jpg"; // 256x256
unsigned output_width, output_height;
Downsample(kLargeEnoughSize, &output_width, &output_height, jpeg_file);
EXPECT_EQ(256u, output_width);
......@@ -244,7 +244,8 @@ TEST(JPEGImageDecoderTest, upsample) {
}
TEST(JPEGImageDecoderTest, yuv) {
const char* jpeg_file = "/images/resources/lenna.jpg"; // 256x256, YUV 4:2:0
// This image is 256x256 with YUV 4:2:0
const char* jpeg_file = "/images/resources/gracehopper.jpg";
unsigned output_y_width, output_y_height, output_uv_width, output_uv_height;
ReadYUV(kLargeEnoughSize, &output_y_width, &output_y_height, &output_uv_width,
&output_uv_height, jpeg_file);
......@@ -312,7 +313,7 @@ TEST(JPEGImageDecoderTest, byteByByteRGBJPEGWithAdobeMarkers) {
// size (when JPEGImageDecoder stops while it may still have input data to
// read) and a call to do a full decode.
TEST(JPEGImageDecoderTest, mergeBuffer) {
const char* jpeg_file = "/images/resources/lenna.jpg";
const char* jpeg_file = "/images/resources/gracehopper.jpg";
TestMergeBuffer(&CreateJPEGDecoder, jpeg_file);
}
......@@ -331,7 +332,7 @@ TEST(JPEGImageDecoderTest, manyProgressiveScans) {
}
TEST(JPEGImageDecoderTest, SupportedSizesSquare) {
const char* jpeg_file = "/images/resources/lenna.jpg"; // 256x256
const char* jpeg_file = "/images/resources/gracehopper.jpg"; // 256x256
scoped_refptr<SharedBuffer> data = ReadFile(jpeg_file);
ASSERT_TRUE(data);
......@@ -448,7 +449,7 @@ TEST(JPEGImageDecoderTest, SupportedSizesRectangleNotMultipleOfMCU) {
}
TEST(JPEGImageDecoderTest, SupportedSizesTruncatedIfMemoryBound) {
const char* jpeg_file = "/images/resources/lenna.jpg"; // 256x256
const char* jpeg_file = "/images/resources/gracehopper.jpg"; // 256x256
scoped_refptr<SharedBuffer> data = ReadFile(jpeg_file);
ASSERT_TRUE(data);
......@@ -557,7 +558,7 @@ INSTANTIATE_TEST_SUITE_P(JPEGImageDecoderTest,
::testing::ValuesIn(kColorSpaceUMATestParams));
TEST(JPEGImageDecoderTest, PartialDataWithoutSize) {
const char* jpeg_file = "/images/resources/lenna.jpg";
const char* jpeg_file = "/images/resources/gracehopper.jpg";
scoped_refptr<SharedBuffer> full_data = ReadFile(jpeg_file);
ASSERT_TRUE(full_data);
......
......@@ -1364,7 +1364,7 @@ TEST(PNGTests, VerifyFrameCompleteBehavior) {
4u, 160u},
{"/images/resources/png-simple.png", 1u, 700u},
{"/images/resources/lenna.png", 1u, 40000u},
{"/images/resources/gracehopper.png", 1u, 40000u},
};
for (const auto& rec : g_recs) {
scoped_refptr<SharedBuffer> full_data = ReadFile(rec.name);
......
......@@ -10,7 +10,7 @@ function loadAndStall()
function bmpImage()
{
return "?name=../../../images/resources/lenna.bmp&mimeType=image%2Fbmp";
return "?name=../../../images/resources/gracehopper.bmp&mimeType=image%2Fbmp";
}
function testDone()
......
......@@ -12,7 +12,7 @@ function loadAndStall()
function jpegImage()
{
return "?name=../../../images/resources/lenna.jpg&mimeType=image%2Fjpeg";
return "?name=../../../images/resources/gracehopper.jpg&mimeType=image%2Fjpeg";
}
function testDone()
......@@ -22,7 +22,7 @@ function testDone()
function runTest()
{
document.querySelector("img").src = loadAndStall() + jpegImage() + "&stallAt=14337&stallFor=60";
document.querySelector("img").src = loadAndStall() + jpegImage() + "&stallAt=26337&stallFor=60";
setTimeout(testDone, 1500);
}
......
......@@ -10,7 +10,7 @@ function loadAndStall()
function pngImage()
{
return "?name=../../../images/resources/lenna.png&mimeType=image%2Fpng";
return "?name=../../../images/resources/gracehopper.png&mimeType=image%2Fpng";
}
function testDone()
......
......@@ -13,7 +13,7 @@ function loadImage()
function xPngImage()
{
return "?name=../../../images/resources/lenna.png&mimeType=" + encodeURIComponent("image/x-png");
return "?name=../../../images/resources/gracehopper.png&mimeType=" + encodeURIComponent("image/x-png");
}
function testDone()
......
<!DOCTYPE html>
<style>
#img {content:url('resources/lenna.png')}
#img {content:url('resources/gracehopper.png')}
</style>
<img id='img' alt='test image'>
<script>
document.getElementById('img').style.content = "url('ImageDoesNotExist')";
document.getElementById('img').style.content = "url('resources/lenna.png')";
document.getElementById('img').style.content = "url('resources/gracehopper.png')";
document.getElementById('img').style.content = "url('ImageDoesNotExist')";
</script>
<p>crbug.com/516239: images set by content: url() should behave correctly with alt text.
<!DOCTYPE html>
<img id='img' alt='test image' src="resources/lenna.png">
<img id='img' alt='test image' src="resources/gracehopper.png">
<p>crbug.com/516239: images set by content: url() should behave correctly with alt text.
......@@ -4,8 +4,8 @@
</style>
<img id='img' alt='test image'>
<script>
document.getElementById('img').style.content = "url('resources/lenna.png')";
document.getElementById('img').style.content = "url('resources/gracehopper.png')";
document.getElementById('img').style.content = "url('ImageDoesNotExist')";
document.getElementById('img').style.content = "url('resources/lenna.png')";
document.getElementById('img').style.content = "url('resources/gracehopper.png')";
</script>
<p>crbug.com/516239: images set by content: url() should behave correctly with alt text.
<!DOCTYPE html>
<img id='img' alt='test image' src="resources/lenna.png">
<img id='img' alt='test image' src="resources/gracehopper.png">
<p>crbug.com/516239: images set by content: url() should behave correctly with alt text.
<!DOCTYPE html>
<style>
#img {content:url('resources/lenna.png')}
#img {content:url('resources/gracehopper.png')}
</style>
<img id='img' alt='test image'>
<p>crbug.com/516239: images set by content: url() should behave correctly with alt text.
......@@ -6,4 +6,4 @@ img {
}
</style>
<p>crbug.com/396717: An image with a percentage height in an auto height container does not treat the height as auto.</p>
<img src="resources/lenna.png" />
<img src="resources/gracehopper.png" />
......@@ -6,4 +6,4 @@ img {
}
</style>
<p>crbug.com/396717: An image with a percentage height in an auto height container does not treat the height as auto.</p>
<img src="resources/lenna.png" />
<img src="resources/gracehopper.png" />
......@@ -22,7 +22,7 @@
<p>
This tests that a standalone image document has viewport settings.
</p>
<iframe src="resources/lenna.jpg" onload="frameLoaded()"></iframe>
<iframe src="resources/gracehopper.jpg" onload="frameLoaded()"></iframe>
<p id="log">FAIL</p>
</body>
</html>
......@@ -10,7 +10,7 @@
top: 0;
width: 100%;
height: 10000px;
background: url('../../images/resources/lenna.png');
background: url('../../images/resources/gracehopper.png');
}
p {
......
......@@ -16,5 +16,5 @@
<script>
window.scrollTo(0, 100);
document.body.style.background = "url('../../images/resources/lenna.png')";
document.body.style.background = "url('../../images/resources/gracehopper.png')";
</script>
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