Merge css3/image/ and fast/images/ to images/

Merge css3/image/ and fast/images/ to images/

This consolidates layout tests for images into one location, although
compositor and imported test suites are unchanged.

R=chrishtr@chromium.org
BUG=664278
Committed: https://crrev.com/05943fbff06f72b9f630d690718777cfc68d8d33
Cr-Commit-Position: refs/heads/master@{#432204}

[Stephen Chennney, 2016-11-10 21:13:31]

Review is largely impossible, apart from agreeing that we should move css3/image
and fast/images into a common images directory.

All the file moves were mechanical and I verified that nothing was left behind
or deleted in the process. I updates various expectations files and various test
suites so we should have exactly the same coverage as before.

All the non-move changes to test files are path adjustments. The trybots will
check and catch errors there.

[chrishtr, 2016-11-10 22:53:48]

The CQ bit was checked by chrishtr@chromium.org

[chrishtr, 2016-11-10 22:53:55]

lgtm

[commit-bot: I haz the power, 2016-11-10 22:54:55]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-11 00:17:06]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-11-11 00:17:13]

Try jobs failed on following builders:
  linux_chromium_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[Stephen Chennney, 2016-11-14 16:49:45]

The CQ bit was checked by schenney@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-11-14 16:50:31]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Stephen Chennney, 2016-11-14 17:44:22]

The CQ bit was unchecked by schenney@chromium.org

[Stephen Chennney, 2016-11-14 17:44:22]

The CQ bit was checked by schenney@chromium.org

[Stephen Chennney, 2016-11-14 17:44:29]

The patchset sent to the CQ was uploaded after l-g-t-m from
chrishtr@chromium.org
Link to the patchset: https://codereview.chromium.org/2496663002/#ps40001
(title: "Address failing tests (3 of them)")

[commit-bot: I haz the power, 2016-11-14 17:44:48]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[pdr., 2016-11-14 22:38:59]

The CQ bit was unchecked by pdr@chromium.org

[Stephen Chennney, 2016-11-15 01:22:13]

The CQ bit was checked by schenney@chromium.org

[commit-bot: I haz the power, 2016-11-15 01:23:24]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-15 03:28:12]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-11-15 03:28:24]

Failed to apply patch for
third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoderTest.cpp:
While running git apply --index -p1;
  error: patch failed:
third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoderTest.cpp:521
  error:
third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoderTest.cpp:
patch does not apply

Patch:      
third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoderTest.cpp
Index:
third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoderTest.cpp
diff --git
a/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoderTest.cpp
b/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoderTest.cpp
index
265cd5c35053d8f539f1a076c4859b30ab2d01d5..3a61ee23a48d18c04c82bc4be500415b918287f5
100644
---
a/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoderTest.cpp
+++
b/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoderTest.cpp
@@ -143,7 +143,7 @@ TEST(AnimatedWebPTests, uniqueGenerationIDs) {
   std::unique_ptr<ImageDecoder> decoder = createDecoder();
 
   RefPtr<SharedBuffer> data =
-      readFile("/LayoutTests/fast/images/resources/webp-animated.webp");
+      readFile("/LayoutTests/images/resources/webp-animated.webp");
   ASSERT_TRUE(data.get());
   decoder->setData(data.get(), true);
 
@@ -160,7 +160,7 @@ TEST(AnimatedWebPTests,
verifyAnimationParametersTransparentImage) {
   EXPECT_EQ(cAnimationLoopOnce, decoder->repetitionCount());
 
   RefPtr<SharedBuffer> data =
-      readFile("/LayoutTests/fast/images/resources/webp-animated.webp");
+      readFile("/LayoutTests/images/resources/webp-animated.webp");
   ASSERT_TRUE(data.get());
   decoder->setData(data.get(), true);
 
@@ -207,7 +207,7 @@ TEST(AnimatedWebPTests,
   EXPECT_EQ(cAnimationLoopOnce, decoder->repetitionCount());
 
   RefPtr<SharedBuffer> data =
-      readFile("/LayoutTests/fast/images/resources/webp-animated-opaque.webp");
+      readFile("/LayoutTests/images/resources/webp-animated-opaque.webp");
   ASSERT_TRUE(data.get());
   decoder->setData(data.get(), true);
 
@@ -254,8 +254,8 @@ TEST(AnimatedWebPTests,
verifyAnimationParametersBlendOverwrite) {
   std::unique_ptr<ImageDecoder> decoder = createDecoder();
   EXPECT_EQ(cAnimationLoopOnce, decoder->repetitionCount());
 
-  RefPtr<SharedBuffer> data = readFile(
-      "/LayoutTests/fast/images/resources/webp-animated-no-blend.webp");
+  RefPtr<SharedBuffer> data =
+      readFile("/LayoutTests/images/resources/webp-animated-no-blend.webp");
   ASSERT_TRUE(data.get());
   decoder->setData(data.get(), true);
 
@@ -300,28 +300,27 @@ TEST(AnimatedWebPTests,
verifyAnimationParametersBlendOverwrite) {
 
 TEST(AnimatedWebPTests, parseAndDecodeByteByByte) {
   testByteByByteDecode(&createDecoder,
-                       "/LayoutTests/fast/images/resources/webp-animated.webp",
-                       3u, cAnimationLoopInfinite);
+                       "/LayoutTests/images/resources/webp-animated.webp", 3u,
+                       cAnimationLoopInfinite);
   testByteByByteDecode(
       &createDecoder,
-      "/LayoutTests/fast/images/resources/webp-animated-icc-xmp.webp", 13u,
-      32000);
+      "/LayoutTests/images/resources/webp-animated-icc-xmp.webp", 13u, 32000);
 }
 
 TEST(AnimatedWebPTests, invalidImages) {
   // ANMF chunk size is smaller than ANMF header size.
-  testInvalidImage(
-      "/LayoutTests/fast/images/resources/invalid-animated-webp.webp", true);
+  testInvalidImage("/LayoutTests/images/resources/invalid-animated-webp.webp",
+                   true);
   // One of the frame rectangles extends outside the image boundary.
-  testInvalidImage(
-      "/LayoutTests/fast/images/resources/invalid-animated-webp3.webp", true);
+  testInvalidImage("/LayoutTests/images/resources/invalid-animated-webp3.webp",
+                   true);
 }
 
 TEST(AnimatedWebPTests, truncatedLastFrame) {
   std::unique_ptr<ImageDecoder> decoder = createDecoder();
 
-  RefPtr<SharedBuffer> data = readFile(
-      "/LayoutTests/fast/images/resources/invalid-animated-webp2.webp");
+  RefPtr<SharedBuffer> data =
+      readFile("/LayoutTests/images/resources/invalid-animated-webp2.webp");
   ASSERT_TRUE(data.get());
   decoder->setData(data.get(), true);
 
@@ -343,8 +342,8 @@ TEST(AnimatedWebPTests, truncatedLastFrame) {
 TEST(AnimatedWebPTests, truncatedInBetweenFrame) {
   std::unique_ptr<ImageDecoder> decoder = createDecoder();
 
-  RefPtr<SharedBuffer> fullData = readFile(
-      "/LayoutTests/fast/images/resources/invalid-animated-webp4.webp");
+  RefPtr<SharedBuffer> fullData =
+      readFile("/LayoutTests/images/resources/invalid-animated-webp4.webp");
   ASSERT_TRUE(fullData.get());
   RefPtr<SharedBuffer> data =
       SharedBuffer::create(fullData->data(), fullData->size() - 1);
@@ -365,7 +364,7 @@ TEST(AnimatedWebPTests, reproCrash) {
   std::unique_ptr<ImageDecoder> decoder = createDecoder();
 
   RefPtr<SharedBuffer> fullData =
-      readFile("/LayoutTests/fast/images/resources/invalid_vp8_vp8x.webp");
+      readFile("/LayoutTests/images/resources/invalid_vp8_vp8x.webp");
   ASSERT_TRUE(fullData.get());
 
   // Parse partial data up to which error in bitstream is not detected.
@@ -391,15 +390,15 @@ TEST(AnimatedWebPTests, reproCrash) {
 }
 
 TEST(AnimatedWebPTests, progressiveDecode) {
-  testProgressiveDecoding(
-      &createDecoder, "/LayoutTests/fast/images/resources/webp-animated.webp");
+  testProgressiveDecoding(&createDecoder,
+                          "/LayoutTests/images/resources/webp-animated.webp");
 }
 
 TEST(AnimatedWebPTests, frameIsCompleteAndDuration) {
   std::unique_ptr<ImageDecoder> decoder = createDecoder();
 
   RefPtr<SharedBuffer> data =
-      readFile("/LayoutTests/fast/images/resources/webp-animated.webp");
+      readFile("/LayoutTests/images/resources/webp-animated.webp");
   ASSERT_TRUE(data.get());
 
   ASSERT_GE(data->size(), 10u);
@@ -428,7 +427,7 @@ TEST(AnimatedWebPTests,
updateRequiredPreviousFrameAfterFirstDecode) {
   std::unique_ptr<ImageDecoder> decoder = createDecoder();
 
   RefPtr<SharedBuffer> fullData =
-      readFile("/LayoutTests/fast/images/resources/webp-animated.webp");
+      readFile("/LayoutTests/images/resources/webp-animated.webp");
   ASSERT_TRUE(fullData.get());
 
   // Check the status of requiredPreviousFrameIndex before decoding, by
@@ -457,37 +456,35 @@ TEST(AnimatedWebPTests,
updateRequiredPreviousFrameAfterFirstDecode) {
 }
 
 TEST(AnimatedWebPTests, randomFrameDecode) {
-  testRandomFrameDecode(
-      &createDecoder, "/LayoutTests/fast/images/resources/webp-animated.webp");
+  testRandomFrameDecode(&createDecoder,
+                        "/LayoutTests/images/resources/webp-animated.webp");
   testRandomFrameDecode(
       &createDecoder,
-      "/LayoutTests/fast/images/resources/webp-animated-opaque.webp");
+      "/LayoutTests/images/resources/webp-animated-opaque.webp");
   testRandomFrameDecode(
-      &createDecoder,
-      "/LayoutTests/fast/images/resources/webp-animated-large.webp");
+      &createDecoder,
"/LayoutTests/images/resources/webp-animated-large.webp");
   testRandomFrameDecode(
       &createDecoder,
-      "/LayoutTests/fast/images/resources/webp-animated-icc-xmp.webp");
+      "/LayoutTests/images/resources/webp-animated-icc-xmp.webp");
 }
 
 TEST(AnimatedWebPTests, randomDecodeAfterClearFrameBufferCache) {
   testRandomDecodeAfterClearFrameBufferCache(
-      &createDecoder, "/LayoutTests/fast/images/resources/webp-animated.webp");
+      &createDecoder, "/LayoutTests/images/resources/webp-animated.webp");
   testRandomDecodeAfterClearFrameBufferCache(
       &createDecoder,
-      "/LayoutTests/fast/images/resources/webp-animated-opaque.webp");
+      "/LayoutTests/images/resources/webp-animated-opaque.webp");
   testRandomDecodeAfterClearFrameBufferCache(
-      &createDecoder,
-      "/LayoutTests/fast/images/resources/webp-animated-large.webp");
+      &createDecoder,
"/LayoutTests/images/resources/webp-animated-large.webp");
   testRandomDecodeAfterClearFrameBufferCache(
       &createDecoder,
-      "/LayoutTests/fast/images/resources/webp-animated-icc-xmp.webp");
+      "/LayoutTests/images/resources/webp-animated-icc-xmp.webp");
 }
 
 TEST(AnimatedWebPTests,
      DISABLED_resumePartialDecodeAfterClearFrameBufferCache) {
   RefPtr<SharedBuffer> fullData =
-      readFile("/LayoutTests/fast/images/resources/webp-animated-large.webp");
+      readFile("/LayoutTests/images/resources/webp-animated-large.webp");
   ASSERT_TRUE(fullData.get());
   Vector<unsigned> baselineHashes;
   createDecodingBaseline(&createDecoder, fullData.get(), &baselineHashes);
@@ -521,64 +518,64 @@ TEST(AnimatedWebPTests,
 
 TEST(AnimatedWebPTests, decodeAfterReallocatingData) {
   testDecodeAfterReallocatingData(
-      &createDecoder, "/LayoutTests/fast/images/resources/webp-animated.webp");
+      &createDecoder, "/LayoutTests/images/resources/webp-animated.webp");
   testDecodeAfterReallocatingData(
       &createDecoder,
-      "/LayoutTests/fast/images/resources/webp-animated-icc-xmp.webp");
+      "/LayoutTests/images/resources/webp-animated-icc-xmp.webp");
 }
 
 TEST(AnimatedWebPTests, alphaBlending) {
-  testAlphaBlending("/LayoutTests/fast/images/resources/webp-animated.webp");
+  testAlphaBlending("/LayoutTests/images/resources/webp-animated.webp");
   testAlphaBlending(
-     
"/LayoutTests/fast/images/resources/webp-animated-semitransparent1.webp");
+      "/LayoutTests/images/resources/webp-animated-semitransparent1.webp");
   testAlphaBlending(
-     
"/LayoutTests/fast/images/resources/webp-animated-semitransparent2.webp");
+      "/LayoutTests/images/resources/webp-animated-semitransparent2.webp");
   testAlphaBlending(
-     
"/LayoutTests/fast/images/resources/webp-animated-semitransparent3.webp");
+      "/LayoutTests/images/resources/webp-animated-semitransparent3.webp");
   testAlphaBlending(
-      "/LayoutTests/fast/images/resour…
(message too large)

[Stephen Chennney, 2016-11-15 17:26:43]

Description was changed from

==========
Merge css3/image/ and fast/images/ to images/

This consolidates layout tests for images into one location, although
compositor and imported test suites are unchanged.

R=chrishtr@chromium.org
BUG=664278
==========

to

==========
Merge css3/image/ and fast/images/ to images/

This consolidates layout tests for images into one location, although
compositor and imported test suites are unchanged.

R=chrishtr@chromium.org
BUG=664278

Committed:
https://chromium.googlesource.com/chromium/src/+/05943fbff06f72b9f630d6907187...
==========

[Stephen Chennney, 2016-11-15 17:26:52]

Committed patchset #5 (id:40001) manually as
05943fbff06f72b9f630d690718777cfc68d8d33 (presubmit successful).

[commit-bot: I haz the power, 2016-11-15 17:31:51]

Description was changed from

==========
Merge css3/image/ and fast/images/ to images/

This consolidates layout tests for images into one location, although
compositor and imported test suites are unchanged.

R=chrishtr@chromium.org
BUG=664278

Committed:
https://chromium.googlesource.com/chromium/src/+/05943fbff06f72b9f630d6907187...
==========

to

==========
Merge css3/image/ and fast/images/ to images/

This consolidates layout tests for images into one location, although
compositor and imported test suites are unchanged.

R=chrishtr@chromium.org
BUG=664278

Committed: https://crrev.com/05943fbff06f72b9f630d690718777cfc68d8d33
Cr-Commit-Position: refs/heads/master@{#432204}
==========