Changeset 143619 in webkit

Timestamp:

Feb 21, 2013 9:50:37 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Remove subresource leaks from WebKit1 and WebKit2
​https://bugs.webkit.org/show_bug.cgi?id=108960

Patch by George McCollister <​george.mccollister@gmail.com> on 2013-02-21
Reviewed by Martin Robinson.

• WebCoreSupport/FrameLoaderClientGtk.cpp:

(WebKit::FrameLoaderClient::dispatchDidFinishLoading): Remove resource
if it isn't the main resource to prevent leak.
(WebKit::FrameLoaderClient::dispatchDidFailLoading): Ditto

• webkit/webkitwebview.cpp:

(cleanupTemporarilyCachedSubresources): Added to cleanup subresources.
(webkit_web_view_get_subresources): Use getSubresources from the
documentLoader to provide subresources since resources will be removed
from webview after loading.

Location:

trunk/Source/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/FrameLoaderClientGtk.cpp (modified) (2 diffs)
• webkit/webkitwebview.cpp (modified) (3 diffs)

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2013-02-21  George McCollister  <george.mccollister@gmail.com>
+
+        [GTK] Remove subresource leaks from WebKit1 and WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=108960
+
+        Reviewed by Martin Robinson.
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::dispatchDidFinishLoading): Remove resource
+        if it isn't the main resource to prevent leak.
+        (WebKit::FrameLoaderClient::dispatchDidFailLoading): Ditto
+        * webkit/webkitwebview.cpp:
+        (cleanupTemporarilyCachedSubresources): Added to cleanup subresources.
+        (webkit_web_view_get_subresources): Use getSubresources from the
+        documentLoader to provide subresources since resources will be removed
+        from webview after loading.
+
 2013-02-21  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

@@ -1021 +1021 @@
     g_signal_emit_by_name(m_frame, "resource-load-finished", webResource);
     g_signal_emit_by_name(webView, "resource-load-finished", m_frame, webResource);
+
+    if (!g_str_equal(identifierString.get(), webView->priv->mainResourceIdentifier.data()))
+        webkit_web_view_remove_resource(webView, identifierString.get());
 }
 
@@ -1043 +1046 @@
     g_signal_emit_by_name(m_frame, "resource-load-failed", webResource, webError.get());
     g_signal_emit_by_name(webView, "resource-load-failed", m_frame, webResource, webError.get());
+
+    if (!g_str_equal(identifierString.get(), webView->priv->mainResourceIdentifier.data()))
+        webkit_web_view_remove_resource(webView, identifierString.get());
 }
 

trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp

@@ -33 +33 @@
 
 #include "AXObjectCache.h"
+#include "ArchiveResource.h"
 #include "BackForwardListImpl.h"
 #include "CairoUtilities.h"
@@ -106 +107 @@
 #include "webkitwebpolicydecision.h"
 #include "webkitwebresource.h"
+#include "webkitwebresourceprivate.h"
 #include "webkitwebsettingsprivate.h"
 #include "webkitwebplugindatabaseprivate.h"
@@ -5107 +5109 @@
 }
 
+static gboolean cleanupTemporarilyCachedSubresources(gpointer data)
+{
+    GList* subResources = static_cast<GList*>(data);
+    g_list_foreach(subResources, reinterpret_cast<GFunc>(g_object_unref), NULL);
+    g_list_free(subResources);
+    return FALSE;
+}
+
 GList* webkit_web_view_get_subresources(WebKitWebView* webView)
 {
-    WebKitWebViewPrivate* priv = webView->priv;
-    GList* subResources = g_hash_table_get_values(priv->subResources.get());
-    return g_list_remove(subResources, priv->mainResource.get());
+    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL);
+    GList* subResources = 0;
+    Vector<PassRefPtr<ArchiveResource> > coreSubResources;
+
+    core(webView)->mainFrame()->loader()->documentLoader()->getSubresources(coreSubResources);
+
+    for (unsigned i = 0; i < coreSubResources.size(); i++) {
+        WebKitWebResource* webResource = WEBKIT_WEB_RESOURCE(g_object_new(WEBKIT_TYPE_WEB_RESOURCE, NULL));
+        webkit_web_resource_init_with_core_resource(webResource, coreSubResources[i]);
+        subResources = g_list_append(subResources, webResource);
+    }
+
+    if (subResources)
+        g_timeout_add(1, cleanupTemporarilyCachedSubresources, g_list_copy(subResources));
+
+    return subResources;
 }