Phase III Step 1: Make ImageResourceContent manage its own ResourceStatus

third_party/WebKit/Source/core/loader/resource/ImageResource.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
@@ skipping 63 matching lines @@
   }
   bool HasDevicePixelRatioHeaderValue() const override {
     return resource_->has_device_pixel_ratio_header_value_;
   }
   float DevicePixelRatioHeaderValue() const override {
     return resource_->device_pixel_ratio_header_value_;
   }
   const ResourceResponse& GetResponse() const override {
     return resource_->GetResponse();
   }
-  ResourceStatus GetStatus() const override { return resource_->GetStatus(); }
   bool ShouldShowPlaceholder() const override {
     return resource_->ShouldShowPlaceholder();
   }
   bool IsCacheValidator() const override {
     return resource_->IsCacheValidator();
   }
   bool SchedulingReloadOrShouldReloadBrokenPlaceholder() const override {
     return resource_->is_scheduling_reload_ ||
            resource_->ShouldReloadBrokenPlaceholder();
   }
@@ skipping 234 matching lines @@
   if (!ErrorOccurred())
     SetStatus(ResourceStatus::kDecodeError);
 
   // Finishes loading if needed, and notifies observers.
   if (!all_data_received && Loader()) {
     // Observers are notified via ImageResource::finish().
     // TODO(hiroshige): Do not call didFinishLoading() directly.
     Loader()->DidFinishLoading(MonotonicallyIncreasingTime(), size, size, size);
   } else {
     auto result = GetContent()->UpdateImage(
-        nullptr, ImageResourceContent::kClearImageAndNotifyObservers,
-        all_data_received);
+        nullptr, GetStatus(),
+        ImageResourceContent::kClearImageAndNotifyObservers, all_data_received);
     DCHECK_EQ(result, ImageResourceContent::UpdateImageResult::kNoDecodeError);
   }
 
   GetMemoryCache()->Remove(this);
 }
 
 void ImageResource::UpdateImageAndClearBuffer() {
   UpdateImage(Data(), ImageResourceContent::kClearAndUpdateImage, true);
   ClearData();
 }
 
+void ImageResource::NotifyStartLoad() {
+  CHECK_EQ(GetStatus(), ResourceStatus::kPending);
+  GetContent()->NotifyStartLoad();
+}
+
 void ImageResource::Finish(double load_finish_time) {
   if (multipart_parser_) {
     multipart_parser_->Finish();
     if (Data())
       UpdateImageAndClearBuffer();
   } else {
     UpdateImage(Data(), ImageResourceContent::kUpdateImage, true);
     // As encoded image data can be created from m_image  (see
     // ImageResource::resourceBuffer(), we don't have to keep m_data. Let's
     // clear this. As for the lifetimes of m_image and m_data, see this
@@ skipping 210 matching lines @@
 }
 
 ResourcePriority ImageResource::PriorityFromObservers() {
   return GetContent()->PriorityFromObservers();
 }
 
 void ImageResource::UpdateImage(
     PassRefPtr<SharedBuffer> shared_buffer,
     ImageResourceContent::UpdateImageOption update_image_option,
     bool all_data_received) {
-  auto result = GetContent()->UpdateImage(
-      std::move(shared_buffer), update_image_option, all_data_received);
+  auto result =
+      GetContent()->UpdateImage(std::move(shared_buffer), GetStatus(),
+                                update_image_option, all_data_received);
   if (result == ImageResourceContent::UpdateImageResult::kShouldDecodeError) {
     // In case of decode error, we call imageNotifyFinished() iff we don't
     // initiate reloading:
     // [(a): when this is in the middle of loading, or (b): otherwise]
     // 1. The updateImage() call above doesn't call notifyObservers().
     // 2. notifyObservers(ShouldNotifyFinish) is called
     //    (a) via updateImage() called in ImageResource::finish()
     //        called via didFinishLoading() called in decodeError(), or
     //    (b) via updateImage() called in decodeError().
     //    imageNotifyFinished() is called here iff we will not initiate
     //    reloading in Step 3 due to notifyObservers()'s
     //    schedulingReloadOrShouldReloadBrokenPlaceholder() check.
     // 3. reloadIfLoFiOrPlaceholderImage() is called via ResourceFetcher
     //    (a) via didFinishLoading() called in decodeError(), or
     //    (b) after returning ImageResource::updateImage().
     DecodeError(all_data_received);
   }
 }
 
 }  // namespace blink