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 36a1f2ad5b7be1cc22836cc07b21ac6b3616eb6b..abb1ff49cf72e94a09e6a7e034c8f3ff4825213c 100644
--- a/third_party/WebKit/Source/core/fetch/Resource.h
+++ b/third_party/WebKit/Source/core/fetch/Resource.h
@@ -247,6 +247,13 @@ protected:
 
     virtual void checkNotify();
 
+    enum class MarkFinishedOption {
+        ShouldMarkFinished,
+        DoNotMarkFinished
+    };
+    void notifyClientsInternal(MarkFinishedOption);
+    void markClientFinished(ResourceClient*);
+
     virtual void destroyDecodedDataForFailedRevalidation() { }
 
     void setEncodedSize(size_t);
@@ -285,8 +292,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;