Send the decoded size when response completed and stop summing in ResourceLoader::DidReceiveData()

third_party/WebKit/Source/core/loader/resource/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 190 matching lines @@
   const int original_image_changed_count = observer->ImageChangedCount();
   const bool already_notified_finish = observer->ImageNotifyFinishedCalled();
   const int image_width_on_image_notify_finished =
       observer->ImageWidthOnImageNotifyFinished();
   ASSERT_NE(kImageWidth, image_width_on_image_notify_finished);
 
   // Does Reload.
   image_resource->Loader()->DidReceiveResponse(WrappedResourceResponse(
       ResourceResponse(test_url, "image/jpeg", kDataLength, g_null_atom)));
   image_resource->Loader()->DidReceiveData(data, kDataLength);
-  image_resource->Loader()->DidFinishLoading(0.0, kDataLength, kDataLength);
+  image_resource->Loader()->DidFinishLoading(0.0, kDataLength, kDataLength,
+                                             kDataLength);
 
   // Checks |imageResource|'s status after reloading.
   EXPECT_EQ(ResourceStatus::kCached, image_resource->GetStatus());
   EXPECT_FALSE(image_resource->ErrorOccurred());
   EXPECT_EQ(kDataLength, image_resource->EncodedSize());
 
   // Checks |observer| after reloading that it is notified of updates/finish.
   EXPECT_LT(original_image_changed_count, observer->ImageChangedCount());
   EXPECT_EQ(kImageWidth, observer->ImageWidthOnLastImageChanged());
   EXPECT_TRUE(observer->ImageNotifyFinishedCalled());
@@ skipping 34 matching lines @@
   response.SetHTTPHeaderField(
       "content-range", BuildContentRange(kJpegImageSubrangeWithDimensionsLength,
                                          sizeof(kJpegImage)));
   image_resource->Loader()->DidReceiveResponse(
       WrappedResourceResponse(response));
   image_resource->Loader()->DidReceiveData(
       reinterpret_cast<const char*>(kJpegImage),
       kJpegImageSubrangeWithDimensionsLength);
   image_resource->Loader()->DidFinishLoading(
       0.0, kJpegImageSubrangeWithDimensionsLength,
+      kJpegImageSubrangeWithDimensionsLength,
       kJpegImageSubrangeWithDimensionsLength);
 
   // Checks that |imageResource| is successfully loaded, showing a placeholder.
   EXPECT_EQ(ResourceStatus::kCached, image_resource->GetStatus());
   EXPECT_EQ(kJpegImageSubrangeWithDimensionsLength,
             image_resource->EncodedSize());
 
   EXPECT_LT(0, observer->ImageChangedCount());
   EXPECT_EQ(kJpegImageWidth, observer->ImageWidthOnLastImageChanged());
   EXPECT_TRUE(observer->ImageNotifyFinishedCalled());
@@ skipping 17 matching lines @@
   EXPECT_FALSE(image_resource->ShouldShowPlaceholder());
   EXPECT_EQ(g_null_atom,
             image_resource->GetResourceRequest().HttpHeaderField("range"));
   EXPECT_EQ(0, observer->ImageChangedCount());
 
   // Serves full response.
   image_resource->Loader()->DidReceiveResponse(WrappedResourceResponse(
       ResourceResponse(url, "image/jpeg", sizeof(kJpegImage), g_null_atom)));
   image_resource->Loader()->DidReceiveData(
       reinterpret_cast<const char*>(kJpegImage), sizeof(kJpegImage));
-  image_resource->Loader()->DidFinishLoading(0.0, sizeof(kJpegImage),
-                                             sizeof(kJpegImage));
+  image_resource->Loader()->DidFinishLoading(
+      0.0, sizeof(kJpegImage), sizeof(kJpegImage), sizeof(kJpegImage));
 
   // Checks that |imageResource| is successfully loaded,
   // showing a non-placeholder image.
   EXPECT_EQ(ResourceStatus::kCached, image_resource->GetStatus());
   EXPECT_EQ(sizeof(kJpegImage), image_resource->EncodedSize());
 
   EXPECT_LT(0, observer->ImageChangedCount());
   EXPECT_EQ(kJpegImageWidth, observer->ImageWidthOnLastImageChanged());
   EXPECT_TRUE(observer->ImageNotifyFinishedCalled());
   EXPECT_EQ(kJpegImageWidth, observer->ImageWidthOnImageNotifyFinished());
@@ skipping 74 matching lines @@
   EXPECT_EQ(0, observer2->ImageChangedCount());
   EXPECT_FALSE(observer2->ImageNotifyFinishedCalled());
 
   const char kThirdPart[] = "--boundary";
   image_resource->AppendData(kThirdPart, strlen(kThirdPart));
   ASSERT_TRUE(image_resource->ResourceBuffer());
   EXPECT_EQ(strlen(kSecondPart) - 1, image_resource->ResourceBuffer()->size());
 
   // This part finishes. The image is created, callbacks are sent, and the data
   // buffer is cleared.
-  image_resource->Loader()->DidFinishLoading(0.0, 0, 0);
+  image_resource->Loader()->DidFinishLoading(0.0, 0, 0, 0);
   EXPECT_TRUE(image_resource->ResourceBuffer());
   EXPECT_FALSE(image_resource->ErrorOccurred());
   ASSERT_TRUE(image_resource->GetContent()->HasImage());
   EXPECT_FALSE(image_resource->GetContent()->GetImage()->IsNull());
   EXPECT_EQ(kJpegImageWidth, image_resource->GetContent()->GetImage()->width());
   EXPECT_EQ(kJpegImageHeight,
             image_resource->GetContent()->GetImage()->height());
   EXPECT_EQ(1, observer->ImageChangedCount());
   EXPECT_TRUE(observer->ImageNotifyFinishedCalled());
   EXPECT_EQ(1, observer2->ImageChangedCount());
@@ skipping 243 matching lines @@
   // Send the image response.
   ResourceResponse resource_response(KURL(), "image/jpeg", sizeof(kJpegImage),
                                      g_null_atom);
   resource_response.AddHTTPHeaderField("chrome-proxy-content-transform",
                                        "empty-image");
 
   image_resource->Loader()->DidReceiveResponse(
       WrappedResourceResponse(resource_response));
   image_resource->Loader()->DidReceiveData(
       reinterpret_cast<const char*>(kJpegImage), sizeof(kJpegImage));
-  image_resource->Loader()->DidFinishLoading(0.0, sizeof(kJpegImage),
-                                             sizeof(kJpegImage));
+  image_resource->Loader()->DidFinishLoading(
+      0.0, sizeof(kJpegImage), sizeof(kJpegImage), sizeof(kJpegImage));
 
   EXPECT_TRUE(observer->ImageNotifyFinishedCalled());
   EXPECT_EQ(image_resource, fetcher->CachedResource(test_url));
 
   fetcher->ReloadLoFiImages();
 
   EXPECT_EQ(3, observer->ImageChangedCount());
 
   TestThatReloadIsStartedThenServeReload(test_url, image_resource, content,
                                          observer.get(),
@@ skipping 377 matching lines @@
 
   image_resource->Loader()->DidReceiveResponse(
       WrappedResourceResponse(
           ResourceResponse(test_url, "image/jpeg", 0, g_null_atom)),
       nullptr);
 
   EXPECT_EQ(ResourceStatus::kPending, image_resource->GetStatus());
   EXPECT_FALSE(observer->ImageNotifyFinishedCalled());
   EXPECT_EQ(0, observer->ImageChangedCount());
 
-  image_resource->Loader()->DidFinishLoading(0.0, 0, 0);
+  image_resource->Loader()->DidFinishLoading(0.0, 0, 0, 0);
 
   EXPECT_EQ(ResourceStatus::kDecodeError, image_resource->GetStatus());
   EXPECT_TRUE(observer->ImageNotifyFinishedCalled());
   EXPECT_EQ(ResourceStatus::kDecodeError,
             observer->StatusOnImageNotifyFinished());
   EXPECT_EQ(1, observer->ImageChangedCount());
   EXPECT_FALSE(image_resource->IsLoading());
 }
 
 // Testing DecodeError that occurs in didFinishLoading().
@@ skipping 24 matching lines @@
   image_resource->Loader()->DidReceiveData(
       reinterpret_cast<const char*>(kJpegImage),
       kJpegImageSubrangeWithoutDimensionsLength);
 
   EXPECT_EQ(ResourceStatus::kPending, image_resource->GetStatus());
   EXPECT_FALSE(observer->ImageNotifyFinishedCalled());
   EXPECT_EQ(0, observer->ImageChangedCount());
 
   image_resource->Loader()->DidFinishLoading(
       0.0, kJpegImageSubrangeWithoutDimensionsLength,
+      kJpegImageSubrangeWithoutDimensionsLength,
       kJpegImageSubrangeWithoutDimensionsLength);
 
   EXPECT_EQ(ResourceStatus::kDecodeError, image_resource->GetStatus());
   EXPECT_TRUE(observer->ImageNotifyFinishedCalled());
   EXPECT_EQ(ResourceStatus::kDecodeError,
             observer->StatusOnImageNotifyFinished());
   EXPECT_EQ(1, observer->ImageChangedCount());
   EXPECT_FALSE(image_resource->IsLoading());
 }
 
@@ skipping 146 matching lines @@
   image_resource->Loader()->DidReceiveResponse(
       WrappedResourceResponse(partial_response));
   image_resource->Loader()->DidReceiveData(
       reinterpret_cast<const char*>(kJpegImage),
       kJpegImageSubrangeWithoutDimensionsLength);
 
   EXPECT_EQ(0, observer->ImageChangedCount());
 
   image_resource->Loader()->DidFinishLoading(
       0.0, kJpegImageSubrangeWithoutDimensionsLength,
+      kJpegImageSubrangeWithoutDimensionsLength,
       kJpegImageSubrangeWithoutDimensionsLength);
 
   EXPECT_FALSE(observer->ImageNotifyFinishedCalled());
   EXPECT_EQ(2, observer->ImageChangedCount());
 
   TestThatReloadIsStartedThenServeReload(
       test_url, image_resource, image_resource->GetContent(), observer.get(),
       WebCachePolicy::kBypassingCache);
 }
 
@@ skipping 118 matching lines @@
 
     ResourceResponse response(test_url, "image/jpeg", sizeof(kJpegImage),
                               g_null_atom);
     response.SetHTTPStatusCode(test.status_code);
     if (test.content_range != g_null_atom)
       response.SetHTTPHeaderField("content-range", test.content_range);
     image_resource->Loader()->DidReceiveResponse(
         WrappedResourceResponse(response));
     image_resource->Loader()->DidReceiveData(
         reinterpret_cast<const char*>(kJpegImage), sizeof(kJpegImage));
-    image_resource->Loader()->DidFinishLoading(0.0, sizeof(kJpegImage),
-                                               sizeof(kJpegImage));
+    image_resource->Loader()->DidFinishLoading(
+        0.0, sizeof(kJpegImage), sizeof(kJpegImage), sizeof(kJpegImage));
 
     EXPECT_EQ(ResourceStatus::kCached, image_resource->GetStatus());
     EXPECT_EQ(sizeof(kJpegImage), image_resource->EncodedSize());
     EXPECT_FALSE(image_resource->ShouldShowPlaceholder());
     EXPECT_LT(0, observer->ImageChangedCount());
     EXPECT_EQ(kJpegImageWidth, observer->ImageWidthOnLastImageChanged());
     EXPECT_TRUE(observer->ImageNotifyFinishedCalled());
     EXPECT_EQ(kJpegImageWidth, observer->ImageWidthOnImageNotifyFinished());
 
     ASSERT_TRUE(image_resource->GetContent()->HasImage());
@@ skipping 169 matching lines @@
   EXPECT_TRUE(observer->ImageNotifyFinishedCalled());
   EXPECT_TRUE(image_resource->GetContent()->GetImage()->IsBitmapImage());
   EXPECT_EQ(50, image_resource->GetContent()->GetImage()->width());
   EXPECT_EQ(50, image_resource->GetContent()->GetImage()->height());
 
   WTF::SetTimeFunctionsForTesting(nullptr);
 }
 
 }  // namespace
 }  // namespace blink