Make multipart image documents work again.

Source/core/fetch/ImageResourceTest.cpp

 /*
  * Copyright (c) 2013, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/fetch/ImageResource.h"
 
 #include "core/fetch/ImageResourceClient.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/MockImageResourceClient.h"
 #include "core/fetch/ResourceFetcher.h"
+#include "core/fetch/ResourceLoader.h"
 #include "core/fetch/ResourcePtr.h"
 #include "core/fetch/UniqueIdentifier.h"
 #include "platform/SharedBuffer.h"
+#include "platform/exported/WrappedResourceResponse.h"
 #include "platform/graphics/Image.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/platform/WebUnitTestSupport.h"
 
 using namespace blink;
 
@@ skipping 26 matching lines @@
         0x00, 0x00, 0xff, 0xda, 0x00, 0x0c, 0x03, 0x01, 0x00, 0x02, 0x11, 0x03, 0x11, 0x00, 0x3f,
         0x00, 0xb2, 0xc0, 0x07, 0xff, 0xd9
     };
 
     jpeg.append(data, sizeof(data));
     return jpeg;
 }
 
 TEST(ImageResourceTest, MultipartImage)
 {
-    ResourcePtr<ImageResource> cachedImage = new ImageResource(ResourceRequest());
-    cachedImage->setLoading(true);
+    RefPtrWillBeRawPtr<ResourceFetcher> fetcher = ResourceFetcher::create(nullptr);
+    KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
+    URLTestHelpers::registerMockedURLLoad(testURL, "cancelTest.html", "text/html");
+
+    // Emulate starting a real load, but don't expect any "real" WebURLLoaderClient callbacks.
+    ResourcePtr<ImageResource> cachedImage = new ImageResource(ResourceRequest(testURL));
+    cachedImage->setIdentifier(createUniqueIdentifier());
+    cachedImage->load(fetcher.get(), ResourceLoaderOptions());
+    Platform::current()->unitTestSupport()->unregisterMockedURL(testURL);
 
     MockImageResourceClient client;
     cachedImage->addClient(&client);
+    EXPECT_EQ(Resource::Pending, cachedImage->status());
 
     // Send the multipart response. No image or data buffer is created.
-    cachedImage->responseReceived(ResourceResponse(KURL(), "multipart/x-mixed-replace", 0, nullAtom, String()), nullptr);
+    // Note that the response must be routed through ResourceLoader to
+    // ensure the load is flagged as multipart.
+    ResourceResponse multipartResponse(KURL(), "multipart/x-mixed-replace", 0, nullAtom, String());
+    cachedImage->loader()->didReceiveResponse(nullptr, WrappedResourceResponse(multipartResponse), nullptr);
     ASSERT_FALSE(cachedImage->resourceBuffer());
     ASSERT_FALSE(cachedImage->hasImage());
     ASSERT_EQ(client.imageChangedCount(), 0);
     ASSERT_FALSE(client.notifyFinishedCalled());
 
     // Send the response for the first real part. No image or data buffer is created.
     const char* svgData = "<svg xmlns='http://www.w3.org/2000/svg' width='1' height='1'><rect width='1' height='1' fill='green'/></svg>";
     unsigned svgDataLength = strlen(svgData);
-    cachedImage->responseReceived(ResourceResponse(KURL(), "image/svg+xml", svgDataLength, nullAtom, String()), nullptr);
+    ResourceResponse payloadResponse(KURL(), "image/svg+xml", svgDataLength, nullAtom, String());
+    cachedImage->loader()->didReceiveResponse(nullptr, WrappedResourceResponse(payloadResponse), nullptr);
     ASSERT_FALSE(cachedImage->resourceBuffer());
     ASSERT_FALSE(cachedImage->hasImage());
     ASSERT_EQ(client.imageChangedCount(), 0);
     ASSERT_FALSE(client.notifyFinishedCalled());
 
     // The first bytes arrive. The data buffer is created, but no image is created.
     cachedImage->appendData(svgData, svgDataLength);
     ASSERT_TRUE(cachedImage->resourceBuffer());
     ASSERT_EQ(cachedImage->resourceBuffer()->size(), svgDataLength);
     ASSERT_FALSE(cachedImage->hasImage());
@@ skipping 79 matching lines @@
 
 TEST(ImageResourceTest, UpdateBitmapImages)
 {
     ResourcePtr<ImageResource> cachedImage = new ImageResource(ResourceRequest());
     cachedImage->setLoading(true);
 
     MockImageResourceClient client;
     cachedImage->addClient(&client);
 
     // Send the image response.
-    cachedImage->responseReceived(ResourceResponse(KURL(), "multipart/x-mixed-replace", 0, nullAtom, String()), nullptr);
-
     Vector<unsigned char> jpeg = jpegImage();
     cachedImage->responseReceived(ResourceResponse(KURL(), "image/jpeg", jpeg.size(), nullAtom, String()), nullptr);
     cachedImage->appendData(reinterpret_cast<const char*>(jpeg.data()), jpeg.size());
     cachedImage->finish();
     ASSERT_FALSE(cachedImage->errorOccurred());
     ASSERT_TRUE(cachedImage->hasImage());
     ASSERT_FALSE(cachedImage->image()->isNull());
-    ASSERT_EQ(client.imageChangedCount(), 1);
+    ASSERT_EQ(client.imageChangedCount(), 2);

[Nate Chapin, 2015/05/27 20:45:24]

Because this test no longer unnecessarily uses multipart, it gets an
imageChanged() callback when data is appended as well as on finish().

     ASSERT_TRUE(client.notifyFinishedCalled());
 
     HashSet<ImageResource*> bitmapImages;
     ASSERT_TRUE(cachedImage->image()->isBitmapImage());
     bitmapImages.add(cachedImage.get());
 }
 
 } // namespace