Change the semantics of ImageLoader::has_pending_load_event_

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 78 matching lines @@
   ImageResource* ImageResourceForImageDocument() const {
     return image_resource_for_image_document_;
   }
   // Cancels pending load events, and doesn't dispatch new ones.
   void SetImage(ImageResourceContent*);
 
   bool IsLoadingImageDocument() { return loading_image_document_; }
   void SetLoadingImageDocument() { loading_image_document_ = true; }
 
   bool HasPendingActivity() const {
-    return has_pending_load_event_ || has_pending_error_event_ || pending_task_;
+    return (image_ && !image_complete_) || has_pending_load_event_ ||

[kouhei (in TOK), 2017/05/08 13:18:40]

:) This totally makes sense!

+           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*);
 
   static void DispatchPendingLoadEvents();
   static void DispatchPendingErrorEvents();
@@ skipping 69 matching lines @@
   // and we delay Document load event from (1) to (3):
   // - |ResourceFetcher::loaders_| delays Document load event from (1) to (2).
   // - |delay_until_image_notify_finished_| delays Document load event from
   //   the first ImageChanged() (at some time between (1) and (2)) until (3).
   // Ideally, we might want to delay Document load event from (1) to (3),
   // but currently we piggyback on ImageChanged() because adding a callback
   // hook at (1) might complicate the code.
   std::unique_ptr<IncrementLoadEventDelayCount>
       delay_until_image_notify_finished_;
 
   bool has_pending_load_event_ : 1;

[kinuko, 2017/05/08 05:36:46]

Could we have a short comment for this field here too?

[kouhei (in TOK), 2017/05/08 13:18:40]

+1
I think you basically need to say that we are shortly going to replace this in
https://codereview.chromium.org/2863763003/

[hiroshige, 2017/05/08 19:05:26]

Done.

   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