Add CHECK()s about ImageLoader::has_pending_load_event_

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

Index: third_party/WebKit/Source/core/loader/ImageLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/ImageLoader.cpp b/third_party/WebKit/Source/core/loader/ImageLoader.cpp
index 02016f038650d43e7eb4cd34f707e60d8ae7af24..22c22f1e4d5d839117cec70754f7ea90423421fa 100644
--- a/third_party/WebKit/Source/core/loader/ImageLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/ImageLoader.cpp
@@ -510,6 +510,12 @@ void ImageLoader::ImageNotifyFinished(ImageResourceContent* resource) {
   DCHECK(failed_load_url_.IsEmpty());
   DCHECK_EQ(resource, image_.Get());
 
+  // TODO(hiroshige): Turn the CHECK()s to DCHECK()s before going to beta.
+  if (loading_image_document_)
+    CHECK(image_complete_);

[yhirano, 2017/05/10 06:44:04]

Just to confirm: This is based on the fact that ImageLoader::UpdateFromElement
is called if and only if loading_image_document_ is false, right?

[hiroshige, 2017/05/10 17:05:44]

Yes, and SetImage() sets image_ to non-null but image_complete_ to true.

Er, this might be not the case when ImageLoader::kUpdateForcedReload is used.
I'll check whether it is covered and write a test if not.

+  else
+    CHECK(!image_complete_);
+
   image_complete_ = true;
 
   // Update ImageAnimationPolicy for image_.
@@ -522,8 +528,12 @@ void ImageLoader::ImageNotifyFinished(ImageResourceContent* resource) {
     ToSVGImage(image_->GetImage())
         ->UpdateUseCounters(GetElement()->GetDocument());
 
-  if (!has_pending_load_event_)
+  if (loading_image_document_) {
+    CHECK(!has_pending_load_event_);
     return;
+  }
+
+  CHECK(has_pending_load_event_);
 
   if (resource->ErrorOccurred()) {
     LoadEventSender().CancelEvent(this);
@@ -623,10 +633,10 @@ void ImageLoader::DispatchPendingEvent(ImageEventSender* event_sender) {
 }
 
 void ImageLoader::DispatchPendingLoadEvent() {
-  if (!has_pending_load_event_)
-    return;
+  CHECK(has_pending_load_event_);
   if (!image_)
     return;
+  CHECK(image_complete_);
   has_pending_load_event_ = false;
   if (GetElement()->GetDocument().GetFrame())
     DispatchLoadEvent();