Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(95)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp

Issue 2468883003: [ImageResource 0b] Decouple ImageResourceObserver::imageNotifyFinished() from notifyFinished() (Closed)
Patch Set: Rebase Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« third_party/WebKit/Source/core/fetch/ImageResource.h ('K') | « third_party/WebKit/Source/core/fetch/ImageResourceObserver.h ('k') | third_party/WebKit/Source/core/fetch/MockResourceClients.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp b/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp
index dacca2c357eab816f9178baf643c622b747e6885..4b9c5358c1dede737b25c161cf27761f3daa00ec 100644
--- a/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp
+++ b/third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp
@@ -421,6 +421,7 @@ TEST(ImageResourceTest, ReloadIfLoFiOrPlaceholderAfterFinished) {
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());
@@ -436,6 +437,7 @@ TEST(ImageResourceTest, ReloadIfLoFiOrPlaceholderAfterFinished) {
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);
@@ -449,9 +451,11 @@ TEST(ImageResourceTest, ReloadIfLoFiOrPlaceholderAfterFinished) {
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());
@@ -605,6 +609,7 @@ TEST(ImageResourceTest, SuccessfulRevalidationJpeg) {
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());
@@ -621,6 +626,7 @@ TEST(ImageResourceTest, SuccessfulRevalidationJpeg) {
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());
@@ -640,6 +646,7 @@ TEST(ImageResourceTest, SuccessfulRevalidationSvg) {
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());
@@ -655,6 +662,7 @@ TEST(ImageResourceTest, SuccessfulRevalidationSvg) {
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());
@@ -675,6 +683,7 @@ TEST(ImageResourceTest, FailedRevalidationJpegToJpeg) {
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());
@@ -689,6 +698,7 @@ TEST(ImageResourceTest, FailedRevalidationJpegToJpeg) {
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());
@@ -709,6 +719,7 @@ TEST(ImageResourceTest, FailedRevalidationJpegToSvg) {
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());
@@ -722,6 +733,7 @@ TEST(ImageResourceTest, FailedRevalidationJpegToSvg) {
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());
@@ -741,6 +753,7 @@ TEST(ImageResourceTest, FailedRevalidationSvgToJpeg) {
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());
@@ -755,6 +768,7 @@ TEST(ImageResourceTest, FailedRevalidationSvgToJpeg) {
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());
@@ -773,7 +787,8 @@ TEST(ImageResourceTest, FailedRevalidationSvgToSvg) {
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());
@@ -787,6 +802,7 @@ TEST(ImageResourceTest, FailedRevalidationSvgToSvg) {
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());
@@ -1028,6 +1044,7 @@ TEST(ImageResourceTest, FetchAllowPlaceholderUnsuccessful) {
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,
@@ -1045,6 +1062,7 @@ TEST(ImageResourceTest, FetchAllowPlaceholderUnsuccessful) {
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());
« third_party/WebKit/Source/core/fetch/ImageResource.h ('K') | « third_party/WebKit/Source/core/fetch/ImageResourceObserver.h ('k') | third_party/WebKit/Source/core/fetch/MockResourceClients.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698