Phase III Step 2: Call imageNotifyFinished() and image load event after SVG loading completes

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 90 matching lines @@
   bool hadError() const { return !m_failedLoadURL.isEmpty(); }
 
   void dispatchPendingEvent(ImageEventSender*);
 
   static void dispatchPendingLoadEvents();
   static void dispatchPendingErrorEvents();
 
   bool getImageAnimationPolicy(ImageAnimationPolicy&) final;
 
  protected:
+  void imageChanged(ImageResourceContent*, const IntRect*) override;
   void imageNotifyFinished(ImageResourceContent*) override;
 
  private:
   class Task;
 
   // Called from the task or from updateFromElement to initiate the load.
   void doUpdateFromElement(BypassMainWorldBehavior,
                            UpdateFromElementBehavior,
                            const KURL&,
                            ReferrerPolicy = ReferrerPolicyDefault);
@@ skipping 34 matching lines @@
   Member<ImageResourceContent> m_image;
   Member<ImageResource> m_imageResourceForImageDocument;
   // FIXME: Oilpan: We might be able to remove this Persistent hack when
   // ImageResourceClient is traceable.
   GC_PLUGIN_IGNORE("http://crbug.com/383741")
   Persistent<Element> m_keepAlive;
 
   Timer<ImageLoader> m_derefElementTimer;
   AtomicString m_failedLoadURL;
   WeakPtr<Task> m_pendingTask;  // owned by Microtask
   std::unique_ptr<IncrementLoadEventDelayCount> m_loadDelayCounter;

[kouhei (in TOK), 2017/03/15 11:32:34]

m_delayLoadUntilUpdateFromElement?

[hiroshige, 2017/05/04 22:50:50]

Done.

+
+  // Delaying load event: the timeline should be:
+  // (0) ImageResource::fetch() is called.
+  // (1) ResourceFetcher::startLoad(): Resource loading is actually started.
+  // (2) ResourceLoader::didFinishLoading() etc:
+  //         Resource loading is finished, but SVG document load might be
+  //         incomplete because of asynchronously loaded subresources.
+  // (3) imageNotifyFinished(): Image is completely loaded.
+  // and we must delay Document load event from (1) to (3).
+  // - |ResourceFetcher::m_loaders| delays Document load event from (1) to (2).
+  // - |m_loadDelayCounter| delays Document load event from the first
+  //   imageChanged() (at some time between (1) and (2)) until (3).
+  // Ideally, we might want |m_loadDelayCounter2| to delay Document load event
+  // from (1) to (3), but currently we piggybacked on imageChanged() because
+  // adding a callback hook at (1) might complicate the code.
+  std::unique_ptr<IncrementLoadEventDelayCount> m_loadDelayCounter2;

[kouhei (in TOK), 2017/03/15 11:32:34]

Do we have a better name for this?
m_delayLoadUntilImageNotifyFinished?

[fs, 2017/03/15 14:22:17]

Anything other than ...2 would be an improvement IMHO =)

[hiroshige, 2017/05/04 22:50:50]

Done.

+
   bool m_hasPendingLoadEvent : 1;
   bool m_hasPendingErrorEvent : 1;
   bool m_imageComplete : 1;
   bool m_loadingImageDocument : 1;
   bool m_elementIsProtected : 1;
   bool m_suppressErrorEvents : 1;
 };
 
 }  // namespace blink
 
 #endif