[ImageResource 0b] Decouple ImageResourceObserver::imageNotifyFinished() from notifyFinished()

third_party/WebKit/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 403 matching lines @@
                                       "empty-image");
 
   cachedImage->responseReceived(resourceResponse, nullptr);
   cachedImage->appendData(reinterpret_cast<const char*>(kJpegImage),
                           sizeof(kJpegImage));
   cachedImage->finish();
   EXPECT_FALSE(cachedImage->errorOccurred());
   ASSERT_TRUE(cachedImage->hasImage());
   EXPECT_FALSE(cachedImage->getImage()->isNull());
   EXPECT_EQ(2, client->imageChangedCount());
+  EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_EQ(sizeof(kJpegImage), client->encodedSizeOnLastImageChanged());
   // The client should have been notified that the image load completed.
   EXPECT_TRUE(client->notifyFinishedCalled());
   EXPECT_EQ(sizeof(kJpegImage), client->encodedSizeOnNotifyFinished());
   EXPECT_EQ(sizeof(kJpegImage), client->encodedSizeOnImageNotifyFinished());
   EXPECT_TRUE(cachedImage->getImage()->isBitmapImage());
   EXPECT_EQ(1, cachedImage->getImage()->width());
   EXPECT_EQ(1, cachedImage->getImage()->height());
 
   // Call reloadIfLoFiOrPlaceholder() after the image has finished loading.
   cachedImage->reloadIfLoFiOrPlaceholder(fetcher);
   EXPECT_FALSE(cachedImage->errorOccurred());
   EXPECT_FALSE(cachedImage->resourceBuffer());
   EXPECT_FALSE(cachedImage->hasImage());
   EXPECT_EQ(3, client->imageChangedCount());
+  EXPECT_EQ(1, client->imageNotifyFinishedCount());
 
   cachedImage->loader()->didReceiveResponse(
       nullptr, WrappedResourceResponse(resourceResponse), nullptr);
   cachedImage->loader()->didReceiveData(
       nullptr, reinterpret_cast<const char*>(kJpegImage2), sizeof(kJpegImage2),
       sizeof(kJpegImage2));
   cachedImage->loader()->didFinishLoading(nullptr, 0.0, sizeof(kJpegImage2),
                                           sizeof(kJpegImage2));
   EXPECT_FALSE(cachedImage->errorOccurred());
   ASSERT_TRUE(cachedImage->hasImage());
   EXPECT_FALSE(cachedImage->getImage()->isNull());
   EXPECT_EQ(sizeof(kJpegImage2), client->encodedSizeOnLastImageChanged());
   EXPECT_TRUE(client->notifyFinishedCalled());
+
   // The client should not have been notified of completion again.
   EXPECT_EQ(sizeof(kJpegImage), client->encodedSizeOnNotifyFinished());
   EXPECT_EQ(sizeof(kJpegImage), client->encodedSizeOnImageNotifyFinished());
+
   EXPECT_TRUE(cachedImage->getImage()->isBitmapImage());
   EXPECT_EQ(50, cachedImage->getImage()->width());
   EXPECT_EQ(50, cachedImage->getImage()->height());
 }
 
 TEST(ImageResourceTest, ReloadIfLoFiOrPlaceholderDuringFetch) {
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
   ScopedRegisteredURL scopedRegisteredURL(testURL);
 
   ResourceRequest request(testURL);
@@ skipping 133 matching lines @@
       new MockImageResourceClient(imageResource);
 
   receiveResponse(imageResource, url, "image/jpeg",
                   reinterpret_cast<const char*>(kJpegImage),
                   sizeof(kJpegImage));
 
   EXPECT_FALSE(imageResource->errorOccurred());
   ASSERT_TRUE(imageResource->hasImage());
   EXPECT_FALSE(imageResource->getImage()->isNull());
   EXPECT_EQ(2, client->imageChangedCount());
+  EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
   EXPECT_TRUE(imageResource->getImage()->isBitmapImage());
   EXPECT_EQ(1, imageResource->getImage()->width());
   EXPECT_EQ(1, imageResource->getImage()->height());
 
   imageResource->setRevalidatingRequest(ResourceRequest(url));
   ResourceResponse response;
   response.setURL(url);
   response.setHTTPStatusCode(304);
 
   imageResource->responseReceived(response, nullptr);
 
   EXPECT_FALSE(imageResource->errorOccurred());
   ASSERT_TRUE(imageResource->hasImage());
   EXPECT_FALSE(imageResource->getImage()->isNull());
   EXPECT_EQ(2, client->imageChangedCount());
+  EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
   EXPECT_TRUE(imageResource->getImage()->isBitmapImage());
   EXPECT_EQ(1, imageResource->getImage()->width());
   EXPECT_EQ(1, imageResource->getImage()->height());
 }
 
 TEST(ImageResourceTest, SuccessfulRevalidationSvg) {
   KURL url(ParsedURLString, "http://127.0.0.1:8000/foo");
   ImageResource* imageResource = ImageResource::create(ResourceRequest(url));
   Persistent<MockImageResourceClient> client =
       new MockImageResourceClient(imageResource);
 
   receiveResponse(imageResource, url, "image/svg+xml", kSvgImage,
                   strlen(kSvgImage));
 
   EXPECT_FALSE(imageResource->errorOccurred());
   ASSERT_TRUE(imageResource->hasImage());
   EXPECT_FALSE(imageResource->getImage()->isNull());
   EXPECT_EQ(1, client->imageChangedCount());
+  EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
   EXPECT_FALSE(imageResource->getImage()->isBitmapImage());
   EXPECT_EQ(200, imageResource->getImage()->width());
   EXPECT_EQ(200, imageResource->getImage()->height());
 
   imageResource->setRevalidatingRequest(ResourceRequest(url));
   ResourceResponse response;
   response.setURL(url);
   response.setHTTPStatusCode(304);
   imageResource->responseReceived(response, nullptr);
 
   EXPECT_FALSE(imageResource->errorOccurred());
   ASSERT_TRUE(imageResource->hasImage());
   EXPECT_FALSE(imageResource->getImage()->isNull());
   EXPECT_EQ(1, client->imageChangedCount());
+  EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
   EXPECT_FALSE(imageResource->getImage()->isBitmapImage());
   EXPECT_EQ(200, imageResource->getImage()->width());
   EXPECT_EQ(200, imageResource->getImage()->height());
 }
 
 TEST(ImageResourceTest, FailedRevalidationJpegToJpeg) {
   KURL url(ParsedURLString, "http://127.0.0.1:8000/foo");
   ImageResource* imageResource = ImageResource::create(ResourceRequest(url));
   Persistent<MockImageResourceClient> client =
       new MockImageResourceClient(imageResource);
 
   receiveResponse(imageResource, url, "image/jpeg",
                   reinterpret_cast<const char*>(kJpegImage),
                   sizeof(kJpegImage));
 
   EXPECT_FALSE(imageResource->errorOccurred());
   ASSERT_TRUE(imageResource->hasImage());
   EXPECT_FALSE(imageResource->getImage()->isNull());
   EXPECT_EQ(2, client->imageChangedCount());
+  EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
   EXPECT_TRUE(imageResource->getImage()->isBitmapImage());
   EXPECT_EQ(1, imageResource->getImage()->width());
   EXPECT_EQ(1, imageResource->getImage()->height());
 
   imageResource->setRevalidatingRequest(ResourceRequest(url));
   receiveResponse(imageResource, url, "image/jpeg",
                   reinterpret_cast<const char*>(kJpegImage2),
                   sizeof(kJpegImage2));
 
   EXPECT_FALSE(imageResource->errorOccurred());
   ASSERT_TRUE(imageResource->hasImage());
   EXPECT_FALSE(imageResource->getImage()->isNull());
   EXPECT_EQ(4, client->imageChangedCount());
+  EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
   EXPECT_TRUE(imageResource->getImage()->isBitmapImage());
   EXPECT_EQ(50, imageResource->getImage()->width());
   EXPECT_EQ(50, imageResource->getImage()->height());
 }
 
 TEST(ImageResourceTest, FailedRevalidationJpegToSvg) {
   KURL url(ParsedURLString, "http://127.0.0.1:8000/foo");
   ImageResource* imageResource = ImageResource::create(ResourceRequest(url));
   Persistent<MockImageResourceClient> client =
       new MockImageResourceClient(imageResource);
 
   receiveResponse(imageResource, url, "image/jpeg",
                   reinterpret_cast<const char*>(kJpegImage),
                   sizeof(kJpegImage));
 
   EXPECT_FALSE(imageResource->errorOccurred());
   ASSERT_TRUE(imageResource->hasImage());
   EXPECT_FALSE(imageResource->getImage()->isNull());
   EXPECT_EQ(2, client->imageChangedCount());
+  EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
   EXPECT_TRUE(imageResource->getImage()->isBitmapImage());
   EXPECT_EQ(1, imageResource->getImage()->width());
   EXPECT_EQ(1, imageResource->getImage()->height());
 
   imageResource->setRevalidatingRequest(ResourceRequest(url));
   receiveResponse(imageResource, url, "image/svg+xml", kSvgImage,
                   strlen(kSvgImage));
 
   EXPECT_FALSE(imageResource->errorOccurred());
   ASSERT_TRUE(imageResource->hasImage());
   EXPECT_FALSE(imageResource->getImage()->isNull());
   EXPECT_EQ(3, client->imageChangedCount());
+  EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
   EXPECT_FALSE(imageResource->getImage()->isBitmapImage());
   EXPECT_EQ(200, imageResource->getImage()->width());
   EXPECT_EQ(200, imageResource->getImage()->height());
 }
 
 TEST(ImageResourceTest, FailedRevalidationSvgToJpeg) {
   KURL url(ParsedURLString, "http://127.0.0.1:8000/foo");
   ImageResource* imageResource = ImageResource::create(ResourceRequest(url));
   Persistent<MockImageResourceClient> client =
       new MockImageResourceClient(imageResource);
 
   receiveResponse(imageResource, url, "image/svg+xml", kSvgImage,
                   strlen(kSvgImage));
 
   EXPECT_FALSE(imageResource->errorOccurred());
   ASSERT_TRUE(imageResource->hasImage());
   EXPECT_FALSE(imageResource->getImage()->isNull());
   EXPECT_EQ(1, client->imageChangedCount());
+  EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
   EXPECT_FALSE(imageResource->getImage()->isBitmapImage());
   EXPECT_EQ(200, imageResource->getImage()->width());
   EXPECT_EQ(200, imageResource->getImage()->height());
 
   imageResource->setRevalidatingRequest(ResourceRequest(url));
   receiveResponse(imageResource, url, "image/jpeg",
                   reinterpret_cast<const char*>(kJpegImage),
                   sizeof(kJpegImage));
 
   EXPECT_FALSE(imageResource->errorOccurred());
   ASSERT_TRUE(imageResource->hasImage());
   EXPECT_FALSE(imageResource->getImage()->isNull());
   EXPECT_EQ(3, client->imageChangedCount());
+  EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
   EXPECT_TRUE(imageResource->getImage()->isBitmapImage());
   EXPECT_EQ(1, imageResource->getImage()->width());
   EXPECT_EQ(1, imageResource->getImage()->height());
 }
 
 TEST(ImageResourceTest, FailedRevalidationSvgToSvg) {
   KURL url(ParsedURLString, "http://127.0.0.1:8000/foo");
   ImageResource* imageResource = ImageResource::create(ResourceRequest(url));
   Persistent<MockImageResourceClient> client =
       new MockImageResourceClient(imageResource);
 
   receiveResponse(imageResource, url, "image/svg+xml", kSvgImage,
                   strlen(kSvgImage));
 
   EXPECT_FALSE(imageResource->errorOccurred());
   ASSERT_TRUE(imageResource->hasImage());
   EXPECT_FALSE(imageResource->getImage()->isNull());
-  EXPECT_EQ(client->imageChangedCount(), 1);
+  EXPECT_EQ(1, client->imageChangedCount());
+  EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
   EXPECT_FALSE(imageResource->getImage()->isBitmapImage());
   EXPECT_EQ(200, imageResource->getImage()->width());
   EXPECT_EQ(200, imageResource->getImage()->height());
 
   imageResource->setRevalidatingRequest(ResourceRequest(url));
   receiveResponse(imageResource, url, "image/svg+xml", kSvgImage2,
                   strlen(kSvgImage2));
 
   EXPECT_FALSE(imageResource->errorOccurred());
   ASSERT_TRUE(imageResource->hasImage());
   EXPECT_FALSE(imageResource->getImage()->isNull());
   EXPECT_EQ(2, client->imageChangedCount());
+  EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_TRUE(client->notifyFinishedCalled());
   EXPECT_FALSE(imageResource->getImage()->isBitmapImage());
   EXPECT_EQ(300, imageResource->getImage()->width());
   EXPECT_EQ(300, imageResource->getImage()->height());
 }
 
 // Tests for pruning.
 
 TEST(ImageResourceTest, AddClientAfterPrune) {
   KURL url(ParsedURLString, "http://127.0.0.1:8000/foo");
@@ skipping 221 matching lines @@
                                   sizeof(kBadData));
 
   // The dimensions could not be extracted, so the full original image should be
   // loading.
   EXPECT_EQ(Resource::Pending, image->getStatus());
   EXPECT_FALSE(image->isPlaceholder());
   EXPECT_EQ(nullAtom, image->resourceRequest().httpHeaderField("range"));
   EXPECT_EQ(static_cast<int>(WebCachePolicy::BypassingCache),
             static_cast<int>(image->resourceRequest().getCachePolicy()));
   EXPECT_FALSE(client->notifyFinishedCalled());
+  EXPECT_EQ(0, client->imageNotifyFinishedCount());
 
   image->loader()->didReceiveResponse(
       nullptr,
       WrappedResourceResponse(ResourceResponse(
           testURL, "image/jpeg", sizeof(kJpegImage), nullAtom, String())));
   image->loader()->didReceiveData(nullptr,
                                   reinterpret_cast<const char*>(kJpegImage),
                                   sizeof(kJpegImage), sizeof(kJpegImage));
   image->loader()->didFinishLoading(nullptr, 0.0, sizeof(kJpegImage),
                                     sizeof(kJpegImage));
 
   EXPECT_EQ(Resource::Cached, image->getStatus());
   EXPECT_EQ(sizeof(kJpegImage), image->encodedSize());
   EXPECT_FALSE(image->isPlaceholder());
   EXPECT_LT(0, client->imageChangedCount());
   EXPECT_EQ(sizeof(kJpegImage), client->encodedSizeOnLastImageChanged());
   EXPECT_TRUE(client->notifyFinishedCalled());
+  EXPECT_EQ(1, client->imageNotifyFinishedCount());
   EXPECT_EQ(sizeof(kJpegImage), client->encodedSizeOnNotifyFinished());
   EXPECT_EQ(sizeof(kJpegImage), client->encodedSizeOnImageNotifyFinished());
 
   ASSERT_TRUE(image->hasImage());
   EXPECT_EQ(1, image->getImage()->width());
   EXPECT_EQ(1, image->getImage()->height());
   EXPECT_TRUE(image->getImage()->isBitmapImage());
 }
 
 TEST(ImageResourceTest, FetchAllowPlaceholderThenDisallowPlaceholder) {
@@ skipping 152 matching lines @@
   EXPECT_TRUE(client->notifyFinishedCalled());
   EXPECT_TRUE(cachedImage->getImage()->isBitmapImage());
   EXPECT_EQ(50, cachedImage->getImage()->width());
   EXPECT_EQ(50, cachedImage->getImage()->height());
 
   WTF::setTimeFunctionsForTesting(nullptr);
 }
 
 }  // namespace
 }  // namespace blink