Mark ResourceClient/ImageResourceObserver finished just before notifying

third_party/WebKit/Source/core/fetch/Resource.h

Index: third_party/WebKit/Source/core/fetch/Resource.h
diff --git a/third_party/WebKit/Source/core/fetch/Resource.h b/third_party/WebKit/Source/core/fetch/Resource.h
index aa38dcd8db673802763783fb5706cc9a8d7ce5ff..88e3172666d009f57355ad6b57a633bc73f3a978 100644
--- a/third_party/WebKit/Source/core/fetch/Resource.h
+++ b/third_party/WebKit/Source/core/fetch/Resource.h
@@ -247,7 +247,14 @@ public:
 protected:
     Resource(const ResourceRequest&, Type, const ResourceLoaderOptions&);
 
-    virtual void checkNotify();
+    enum class MarkFinishedOption {
+        ShouldMarkFinished,
+        DoNotMarkFinished
+    };
+    // MarkFinishedOption controls whether clients/observers are marked as
+    // finished when notified of finish.
+    virtual void checkNotify(MarkFinishedOption);
+    void markClientFinished(ResourceClient*);
 
     virtual void destroyDecodedDataForFailedRevalidation() { }
 
@@ -283,8 +290,6 @@ protected:
     virtual bool isSafeToUnlock() const { return false; }
     virtual void destroyDecodedDataIfPossible() { }
 
-    virtual void markClientsAndObserversFinished();
-
     // Returns the memory dump name used for tracing. See Resource::onMemoryDump.
     String getMemoryDumpName() const;