Refactor ImageLoader::UpdateFromElement(kUpdateForcedReload)

third_party/WebKit/Source/core/loader/ImageLoader.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 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
  * version 2 of the License, or (at your option) any later version.
@@ skipping 407 matching lines @@
                                     ReferrerPolicy referrer_policy) {
   AtomicString image_source_url = element_->ImageSourceURL();
   suppress_error_events_ = (update_behavior == kUpdateSizeChanged);
 
   if (update_behavior == kUpdateIgnorePreviousError)
     ClearFailedLoadURL();
 
   if (!failed_load_url_.IsEmpty() && image_source_url == failed_load_url_)
     return;
 
+  if (loading_image_document_ && update_behavior == kUpdateForcedReload) {
+    // Prepares for reloading ImageDocument.

[kinuko, 2017/05/12 08:28:33]

nit: I think we generally use imperative format for the code comment (while
descriptive format for header comments), i.e. 'Prepare for ...'

(I think our internal style guide used to have this but I can't find this
anymore, so fyi/optional)

+    // We turn the ImageLoader into non-ImageDocument here, and proceed to
+    // reloading just like an ordinary <img> element below.
+    loading_image_document_ = false;
+    image_resource_for_image_document_ = nullptr;
+    ClearImage();
+  }
+
   // Prevent the creation of a ResourceLoader (and therefore a network request)
   // for ImageDocument loads. In this case, the image contents have already been
   // requested as a main resource and ImageDocumentParser will take care of
   // funneling the main resource bytes into image_, so just create an
   // ImageResource to be populated later.
-  if (loading_image_document_ && update_behavior != kUpdateForcedReload) {
+  if (loading_image_document_) {
     ImageResource* image_resource = ImageResource::Create(
         ResourceRequest(ImageSourceToKURL(element_->ImageSourceURL())));
     image_resource->SetStatus(ResourceStatus::kPending);
     image_resource->NotifyStartLoad();
     SetImageForImageDocument(image_resource);
     return;
   }
 
   // If we have a pending task, we have to clear it -- either we're now loading
   // immediately, or we need to reset the task's state.
@@ skipping 224 matching lines @@
 }
 
 void ImageLoader::ElementDidMoveToNewDocument() {
   if (load_delay_counter_)
     load_delay_counter_->DocumentChanged(element_->GetDocument());
   ClearFailedLoadURL();
   ClearImage();
 }
 
 }  // namespace blink