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

third_party/WebKit/Source/core/loader/resource/ImageResource.cpp

Index: third_party/WebKit/Source/core/loader/resource/ImageResource.cpp
diff --git a/third_party/WebKit/Source/core/loader/resource/ImageResource.cpp b/third_party/WebKit/Source/core/loader/resource/ImageResource.cpp
index cf06e6556dafd91e034ce3c3c00447690c2e3e97..7cdaf60cb73cb122fb1032faa7f8ccd8b28cb344 100644
--- a/third_party/WebKit/Source/core/loader/resource/ImageResource.cpp
+++ b/third_party/WebKit/Source/core/loader/resource/ImageResource.cpp
@@ -181,6 +181,16 @@ bool ImageResource::CanReuse(const FetchParameters& params) const {
   return true;
 }
 
+bool ImageResource::CanUseCacheValidator() const {
+  // Disable revalidation while ImageResourceContent is still waiting for
+  // SVG load completion.
+  // TODO(hiroshige): Clean up revalidation-related dependencies.
+  if (!GetContent()->IsLoaded())
+    return false;
+
+  return Resource::CanUseCacheValidator();
+}
+
 ImageResource* ImageResource::Create(const ResourceRequest& request) {
   return new ImageResource(request, ResourceLoaderOptions(),
                            ImageResourceContent::Create(), false);