Changeset 167743 in webkit

Timestamp:

Apr 23, 2014 9:11:50 PM (10 years ago)

Author:

akling@apple.com

Message:

CachedResourceLoader hoards URLs indefinitely for no good reason.
<​https://webkit.org/b/132102>
<rdar://problem/16708265>

Since we don't care about CachedResourceLoader::m_validatedURL's after
the Document has finished dispatching its initial load event, clear the
set at that point, and don't add any new URLs to it.

Reviewed by Anders Carlsson.

• dom/Document.cpp:

(WebCore::Document::dispatchWindowLoadEvent):

• loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::requestResource):
(WebCore::CachedResourceLoader::documentDidFinishLoadEvent):

• loader/cache/CachedResourceLoader.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• loader/cache/CachedResourceLoader.cpp (modified) (2 diffs)
• loader/cache/CachedResourceLoader.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-23  Andreas Kling  <akling@apple.com>
+
+        CachedResourceLoader hoards URLs indefinitely for no good reason.
+        <https://webkit.org/b/132102>
+        <rdar://problem/16708265>
+
+        Since we don't care about CachedResourceLoader::m_validatedURL's after
+        the Document has finished dispatching its initial load event, clear the
+        set at that point, and don't add any new URLs to it.
+
+        Reviewed by Anders Carlsson.
+
+        * dom/Document.cpp:
+        (WebCore::Document::dispatchWindowLoadEvent):
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::requestResource):
+        (WebCore::CachedResourceLoader::documentDidFinishLoadEvent):
+        * loader/cache/CachedResourceLoader.h:
+
 2014-04-23  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -3698 +3698 @@
     m_domWindow->dispatchLoadEvent();
     m_loadEventFinished = true;
+    if (m_cachedResourceLoader)
+        m_cachedResourceLoader->documentDidFinishLoadEvent();
 }
 

trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

@@ -478 +478 @@
     }
 
-    if (!request.resourceRequest().url().protocolIsData())
+    if (document() && !document()->loadEventFinished() && !request.resourceRequest().url().protocolIsData())
         m_validatedURLs.add(request.resourceRequest().url());
 
@@ -484 +484 @@
     m_documentResources.set(resource->url(), resource);
     return resource;
+}
+
+void CachedResourceLoader::documentDidFinishLoadEvent()
+{
+    m_validatedURLs.clear();
 }
 

trunk/Source/WebCore/loader/cache/CachedResourceLoader.h

@@ -133 +133 @@
 
     static const ResourceLoaderOptions& defaultCachedResourceOptions();
+
+    void documentDidFinishLoadEvent();
 
 private: