Refactor ImageLoader::UpdateFromElement(kUpdateForcedReload)

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2009 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 68 matching lines @@
 
   void UpdateFromElement(UpdateFromElementBehavior = kUpdateNormal,
                          ReferrerPolicy = kReferrerPolicyDefault);
 
   void ElementDidMoveToNewDocument();
 
   Element* GetElement() const { return element_; }
   bool ImageComplete() const { return image_complete_ && !pending_task_; }
 
   ImageResourceContent* GetImage() const { return image_.Get(); }
-  ImageResource* ImageResourceForImageDocument() const {
-    return image_resource_for_image_document_;
-  }
 
   // Cancels pending load events, and doesn't dispatch new ones.
   // Note: ClearImage/SetImage.*() are not a simple setter.
   // Check the implementation to see what they do.
   // TODO(hiroshige): Cleanup these methods.
   void ClearImage();
   void SetImageForTest(ImageResourceContent*);
 
+  // Image document loading:
+  // When |loading_image_document_| is true:
+  //   Loading via ImageDocument.
+  //   |image_resource_for_image_document_| points to a ImageResource that is
+  //   not associated with a ResourceLoader.
+  //   The corresponding ImageDocument is responsible for supplying the response
+  //   and data to |image_resource_for_image_document_| and thus |image_|.
+  // Otherwise:
+  //   Normal loading via ResourceFetcher/ResourceLoader.
+  //   |image_resource_for_image_document_| is null.

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

Thanks for adding this comment!

   bool IsLoadingImageDocument() { return loading_image_document_; }
   void SetLoadingImageDocument() { loading_image_document_ = true; }
+  ImageResource* ImageResourceForImageDocument() const {
+    return image_resource_for_image_document_;
+  }
 
   bool HasPendingActivity() const {
     return has_pending_load_event_ || has_pending_error_event_ || pending_task_;
   }
 
   bool HasPendingError() const { return has_pending_error_event_; }
 
   bool HadError() const { return !failed_load_url_.IsEmpty(); }
 
   void DispatchPendingEvent(ImageEventSender*);
@@ skipping 69 matching lines @@
   bool has_pending_error_event_ : 1;
   bool image_complete_ : 1;
   bool loading_image_document_ : 1;
   bool element_is_protected_ : 1;
   bool suppress_error_events_ : 1;
 };
 
 }  // namespace blink
 
 #endif