Revert of SVGImage: check requestCount() to check all subresources are loaded

third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp

Index: third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp
diff --git a/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp b/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp
index 7d3eae65ba13cd2ea1b008a7fe51b4eed53ce3e1..a58ec2ac8199c8129ad82cdfcedc380b5830faa0 100644
--- a/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp
+++ b/third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp
@@ -32,16 +32,15 @@
 #include "core/animation/AnimationTimeline.h"
 #include "core/dom/NodeTraversal.h"
 #include "core/dom/shadow/ComposedTreeTraversal.h"
-#include "core/fetch/ResourceFetcher.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
+#include "core/style/ComputedStyle.h"
 #include "core/layout/svg/LayoutSVGRoot.h"
 #include "core/loader/FrameLoadRequest.h"
 #include "core/paint/CompositingRecorder.h"
 #include "core/paint/FloatClipRecorder.h"
 #include "core/paint/TransformRecorder.h"
-#include "core/style/ComputedStyle.h"
 #include "core/svg/SVGDocumentExtensions.h"
 #include "core/svg/SVGFEImageElement.h"
 #include "core/svg/SVGImageElement.h"
@@ -99,20 +98,14 @@
     return page->chromeClient().isSVGImageChromeClient();
 }
 
-void SVGImage::assertSubresourcesLoaded() const
-{
-    RELEASE_ASSERT(m_page);
-    LocalFrame* frame = toLocalFrame(m_page->mainFrame());
-    RELEASE_ASSERT(frame->document()->fetcher()->requestCount() == 0);
-}
-
 bool SVGImage::currentFrameHasSingleSecurityOrigin() const
 {
     if (!m_page)
         return true;
 
     LocalFrame* frame = toLocalFrame(m_page->mainFrame());
-    assertSubresourcesLoaded();
+
+    RELEASE_ASSERT(frame->document()->loadEventFinished());
 
     SVGSVGElement* rootElement = frame->document()->accessSVGExtensions().rootElement();
     if (!rootElement)