Remove duplication of encoded image data

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 219 matching lines @@
     ASSERT_EQ(client->imageChangedCount(), 0);
     ASSERT_FALSE(client->notifyFinishedCalled());
 
     const char thirdPart[] = "--boundary";
     cachedImage->appendData(thirdPart, strlen(thirdPart));
     ASSERT_TRUE(cachedImage->resourceBuffer());
     ASSERT_EQ(cachedImage->resourceBuffer()->size(), strlen(secondPart) - 1);
 
     // This part finishes. The image is created, callbacks are sent, and the data buffer is cleared.
     cachedImage->loader()->didFinishLoading(nullptr, 0.0, 0);
-    ASSERT_FALSE(cachedImage->resourceBuffer());
+    ASSERT_TRUE(cachedImage->resourceBuffer());
     ASSERT_FALSE(cachedImage->errorOccurred());
     ASSERT_TRUE(cachedImage->hasImage());
     ASSERT_FALSE(cachedImage->getImage()->isNull());
     ASSERT_EQ(cachedImage->getImage()->width(), 1);
     ASSERT_EQ(cachedImage->getImage()->height(), 1);
     ASSERT_EQ(client->imageChangedCount(), 1);
     ASSERT_TRUE(client->notifyFinishedCalled());
 }
 
 TEST(ImageResourceTest, CancelOnDetach)
@@ skipping 44 matching lines @@
     ASSERT_TRUE(cachedImage->hasImage());
     ASSERT_FALSE(cachedImage->getImage()->isNull());
     ASSERT_TRUE(client->notifyFinishedCalled());
 
     // The prune comes when the ImageResource still has clients. The image should not be deleted.
     cachedImage->prune();
     ASSERT_TRUE(cachedImage->hasClientsOrObservers());
     ASSERT_TRUE(cachedImage->hasImage());
     ASSERT_FALSE(cachedImage->getImage()->isNull());
 
-    // The ImageResource no longer has clients. The image should be deleted by prune.
+    // The ImageResource no longer has clients. The decoded image data should be
+    // deleted by prune.
     client->removeAsClient();
     cachedImage->prune();
     ASSERT_FALSE(cachedImage->hasClientsOrObservers());
-    ASSERT_FALSE(cachedImage->hasImage());
-    ASSERT_TRUE(cachedImage->getImage()->isNull());
+    ASSERT_TRUE(cachedImage->hasImage());
+    // TODO(hajimehoshi): Should check cachedImage doesn't have decoded image
+    // data.
 }
 
 TEST(ImageResourceTest, UpdateBitmapImages)
 {
     ImageResource* cachedImage = ImageResource::create(ResourceRequest());
     cachedImage->setStatus(Resource::Pending);
 
     Persistent<MockImageResourceClient> client = new MockImageResourceClient(cachedImage);
 
     // Send the image response.
@@ skipping 29 matching lines @@
     cachedImage->finish();
     ASSERT_FALSE(cachedImage->errorOccurred());
     ASSERT_TRUE(cachedImage->hasImage());
     ASSERT_FALSE(cachedImage->getImage()->isNull());
     ASSERT_EQ(client->imageChangedCount(), 2);
     ASSERT_TRUE(client->notifyFinishedCalled());
     ASSERT_TRUE(cachedImage->getImage()->isBitmapImage());
 
     cachedImage->reloadIfLoFi(fetcher);
     ASSERT_FALSE(cachedImage->errorOccurred());
-    ASSERT_FALSE(cachedImage->resourceBuffer());
+    ASSERT_TRUE(cachedImage->resourceBuffer());
     ASSERT_TRUE(cachedImage->hasImage());
-    ASSERT_EQ(client->imageChangedCount(), 3);
+    ASSERT_EQ(client->imageChangedCount(), 2);
 
     cachedImage->loader()->didReceiveResponse(nullptr, WrappedResourceResponse(resourceResponse), nullptr);
     cachedImage->loader()->didReceiveData(nullptr, reinterpret_cast<const char*>(jpeg.data()), jpeg.size(), jpeg.size());
     cachedImage->loader()->didFinishLoading(nullptr, 0.0, jpeg.size());
     ASSERT_FALSE(cachedImage->errorOccurred());
     ASSERT_TRUE(cachedImage->hasImage());
     ASSERT_FALSE(cachedImage->getImage()->isNull());
     ASSERT_TRUE(client->notifyFinishedCalled());
     ASSERT_TRUE(cachedImage->getImage()->isBitmapImage());
 }
@@ skipping 219 matching lines @@
     EXPECT_EQ(1, imageResource->getImage()->width());
     EXPECT_EQ(1, imageResource->getImage()->height());
     EXPECT_TRUE(client1->notifyFinishedCalled());
 
     client1->removeAsClient();
 
     EXPECT_FALSE(imageResource->hasClientsOrObservers());
 
     imageResource->prune();
 
-    EXPECT_FALSE(imageResource->hasImage());
+    EXPECT_TRUE(imageResource->hasImage());
 
     // Re-adds a ResourceClient but not ImageResourceObserver.
     Persistent<MockResourceClient> client2 = new MockResourceClient(imageResource);
 
     ASSERT_TRUE(imageResource->hasImage());
     EXPECT_FALSE(imageResource->getImage()->isNull());
     EXPECT_EQ(1, imageResource->getImage()->width());
     EXPECT_EQ(1, imageResource->getImage()->height());
     EXPECT_TRUE(client2->notifyFinishedCalled());
 }
 
 } // namespace blink