Changeset 30226 in webkit

Timestamp:

Feb 14, 2008, 4:26:44 AM (17 years ago)

Author:

zecke@webkit.org

Message:

• Make sure that the WebCore::Frame is living as long as the WebKitWebFrame wrapped around it. All current calls to WebCore::Frame from within the WebKitWebFrame are safe, even in the case where the WebCore::Frame is already detached from the WebCore::Page.
• For the mainFrame the WebKitWebView is holding the initial reference and will unref on destruction.
• For sub-frames the FramerLoaderClientGtk.cpp will do the unrefing when the frame gets detached from the parent.
• Make sure FrameLoader::detachFromParent gets called by calling FrameLoader::detachChildren

Location:

trunk/WebKit/gtk

Files:

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

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2008-02-14  Holger Hans Peter Freyther  <holger.freyther@trolltech.com>
+
+        Reviewed by Alp.
+
+        * Make sure that the WebCore::Frame is living as long as the WebKitWebFrame
+        wrapped around it. All current calls to WebCore::Frame from within the
+        WebKitWebFrame are safe, even in the case where the WebCore::Frame is already
+        detached from the WebCore::Page.
+        * For the mainFrame the WebKitWebView is holding the initial reference and
+        will unref on destruction.
+        * For sub-frames the FramerLoaderClientGtk.cpp will do the unrefing when the
+        frame gets detached from the parent.
+        * Make sure FrameLoader::detachFromParent gets called by calling FrameLoader::detachChildren
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::detachedFromParent4):
+        * webkit/webkitprivate.cpp:
+        (WebKit::core):
+        * webkit/webkitprivate.h:
+        * webkit/webkitwebframe.cpp:
+        * webkit/webkitwebview.cpp:
+
 2008-02-14  Holger Hans Peter Freyther  <holger.freyther@trolltech.com>
 

trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

@@ -453 +453 @@
 void FrameLoaderClient::detachedFromParent4()
 {
-    notImplemented();
+    ASSERT(m_frame);
+    g_object_unref(m_frame);
+    m_frame = 0;
 }
 

trunk/WebKit/gtk/webkit/webkitprivate.cpp

@@ -50 +50 @@
 
     WebKitWebFramePrivate* priv = frame->priv;
-    return priv ? priv->coreFrame : 0;
+    return priv ? priv->coreFrame.get() : 0;
 }
 

trunk/WebKit/gtk/webkit/webkitprivate.h

@@ -90 +90 @@
     typedef struct _WebKitWebFramePrivate WebKitWebFramePrivate;
     struct _WebKitWebFramePrivate {
-        WebCore::Frame* coreFrame;
+        WTF::RefPtr<WebCore::Frame> coreFrame;
         WebCore::FrameLoaderClient* client;
         WebKitWebView* webView;

trunk/WebKit/gtk/webkit/webkitwebframe.cpp

@@ -94 +94 @@
 
     priv->coreFrame->loader()->cancelAndClear();
+    priv->coreFrame = 0;
+
     g_free(priv->name);
     g_free(priv->title);
@@ -217 +219 @@
     priv->coreFrame = new Frame(viewPriv->corePage, 0, priv->client);
 
-    FrameView* frameView = new FrameView(priv->coreFrame);
+    FrameView* frameView = new FrameView(priv->coreFrame.get());
     frameView->setContainingWindow(GTK_CONTAINER(webView));
     frameView->setGtkAdjustments(GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 0.0, 0.0, 0.0, 0.0)),
@@ -238 +240 @@
     priv->coreFrame = new Frame(viewPriv->corePage, element, priv->client);
 
-    FrameView* frameView = new FrameView(priv->coreFrame);
+    FrameView* frameView = new FrameView(priv->coreFrame.get());
     frameView->setContainingWindow(GTK_CONTAINER(webView));
     priv->coreFrame->setView(frameView);

trunk/WebKit/gtk/webkit/webkitwebview.cpp

@@ -613 +613 @@
     webkit_web_view_stop_loading(WEBKIT_WEB_VIEW(object));
 
+    core(priv->mainFrame)->loader()->detachChildren();
     delete priv->corePage;