Changeset 71090 in webkit

Timestamp:

Nov 1, 2010 6:36:43 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-11-01 Jennifer Braithwaite <​jennb@google.com>

Reviewed by Martin Robinson.

GTK: Update resource tracking when moving a frame between documents
​https://bugs.webkit.org/show_bug.cgi?id=48362

• WebCoreSupport/FrameLoaderClientGtk.cpp: (WebKit::FrameLoaderClient::transferLoadingResourceFromPage): Assign resource id to current web view and remove from former web view.
• webkit/webkitprivate.h:
• webkit/webkitwebview.cpp: (webkit_web_view_remove_resource): Added.

Location:

trunk/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/FrameLoaderClientGtk.cpp (modified) (1 diff)
• webkit/webkitprivate.h (modified) (1 diff)
• webkit/webkitwebview.cpp (modified) (1 diff)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2010-11-01  Jennifer Braithwaite  <jennb@google.com>
+
+        Reviewed by Martin Robinson.
+
+        GTK: Update resource tracking when moving a frame between documents
+        https://bugs.webkit.org/show_bug.cgi?id=48362
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::transferLoadingResourceFromPage):
+        Assign resource id to current web view and remove from former web view.
+        * webkit/webkitprivate.h:
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_remove_resource):
+        Added.
+
 2010-11-01  Mario Sanchez Prada  <msanchez@igalia.com>
 

trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

@@ -621 +621 @@
 }
 
-void FrameLoaderClient::transferLoadingResourceFromPage(unsigned long, WebCore::DocumentLoader*, const WebCore::ResourceRequest&, WebCore::Page*)
-{
+void FrameLoaderClient::transferLoadingResourceFromPage(unsigned long identifier, WebCore::DocumentLoader* docLoader, const WebCore::ResourceRequest& request, WebCore::Page* oldPage)
+{
+    ASSERT(oldPage != core(m_frame)->page());
+
+    GOwnPtr<gchar> identifierString(toString(identifier));
+    ASSERT(!webkit_web_view_get_resource(getViewFromFrame(m_frame), identifierString.get()));
+
+    assignIdentifierToInitialRequest(identifier, docLoader, request);
+
+    webkit_web_view_remove_resource(kit(oldPage), identifierString.get());
 }
 

trunk/WebKit/gtk/webkit/webkitprivate.h

@@ -279 +279 @@
     webkit_web_view_add_resource(WebKitWebView*, const char*, WebKitWebResource*);
 
+    void
+    webkit_web_view_remove_resource(WebKitWebView*, const char*);
+
     WebKitWebResource*
     webkit_web_view_get_resource(WebKitWebView*, char*);

trunk/WebKit/gtk/webkit/webkitwebview.cpp

@@ -4648 +4648 @@
 }
 
+void webkit_web_view_remove_resource(WebKitWebView* webView, const char* identifier)
+{
+    WebKitWebViewPrivate* priv = webView->priv;
+    if (g_str_equal(identifier, priv->mainResourceIdentifier.data())) {
+        priv->mainResourceIdentifier = "";
+        priv->mainResource = 0;
+    } else
+      g_hash_table_remove(priv->subResources.get(), identifier);
+}
+
 WebKitWebResource* webkit_web_view_get_resource(WebKitWebView* webView, char* identifier)
 {