2009-03-28 Jan Michael Alonzo <jmalonzo@webkit.org>
authorjmalonzo@webkit.org <jmalonzo@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 28 Mar 2009 08:55:09 +0000 (08:55 +0000)
committerjmalonzo@webkit.org <jmalonzo@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 28 Mar 2009 08:55:09 +0000 (08:55 +0000)
        Gtk build fix. Not reviewed.

        FrameLoader::loadURL and FrameLoader::detachChildren went private
        per changes in http://trac.webkit.org/changeset/42055. Follow
        Mac's behaviour and use FrameLoader::loadURLIntoChildFrame for
        loadURL and FrameLoader::detachParent for detachChildrem.

        * WebCoreSupport/FrameLoaderClientGtk.cpp:
        (WebKit::FrameLoaderClient::createFrame):
        * webkit/webkitwebview.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@42069 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/gtk/ChangeLog
WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
WebKit/gtk/webkit/webkitwebview.cpp

index 3691b4b..5a66639 100644 (file)
@@ -1,3 +1,16 @@
+2009-03-28  Jan Michael Alonzo  <jmalonzo@webkit.org>
+
+        Gtk build fix. Not reviewed.
+
+        FrameLoader::loadURL and FrameLoader::detachChildren went private
+        per changes in http://trac.webkit.org/changeset/42055. Follow
+        Mac's behaviour and use FrameLoader::loadURLIntoChildFrame for
+        loadURL and FrameLoader::detachParent for detachChildrem.
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::createFrame):
+        * webkit/webkitwebview.cpp:
+
 2009-03-25  Gustavo Noronha Silva  <gns@gnome.org>
 
         Reviewed by Holger Freyther.
 2009-03-25  Gustavo Noronha Silva  <gns@gnome.org>
 
         Reviewed by Holger Freyther.
index a54aecc..97c3eb2 100644 (file)
@@ -438,7 +438,7 @@ PassRefPtr<Frame> FrameLoaderClient::createFrame(const KURL& url, const String&
 
     childFrame->tree()->setName(name);
     childFrame->init();
 
     childFrame->tree()->setName(name);
     childFrame->init();
-    childFrame->loader()->loadURL(url, referrer, String(), false, FrameLoadTypeRedirectWithLockedBackForwardList, 0, 0);
+    childFrame->loader()->loadURLIntoChildFrame(url, referrer, childFrame.get());
 
     // The frame's onload handler may have removed it from the document.
     if (!childFrame->tree()->parent())
 
     // The frame's onload handler may have removed it from the document.
     if (!childFrame->tree()->parent())
index d6a0d54..265dd23 100644 (file)
@@ -863,7 +863,7 @@ static void webkit_web_view_dispose(GObject* object)
     if (priv->corePage) {
         webkit_web_view_stop_loading(WEBKIT_WEB_VIEW(object));
 
     if (priv->corePage) {
         webkit_web_view_stop_loading(WEBKIT_WEB_VIEW(object));
 
-        core(priv->mainFrame)->loader()->detachChildren();
+        core(priv->mainFrame)->loader()->detachFromParent();
         delete priv->corePage;
         priv->corePage = NULL;
     }
         delete priv->corePage;
         priv->corePage = NULL;
     }