WebKit/gtk:
authorweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Dec 2007 08:41:12 +0000 (08:41 +0000)
committerweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Dec 2007 08:41:12 +0000 (08:41 +0000)
        Build fix.

        * WebCoreSupport/FrameLoaderClientGtk.cpp:
        (WebKit::FrameLoaderClient::didChangeTitle):

WebKit/qt:

        Build fix.

        * WebCoreSupport/FrameLoaderClientQt.cpp:
        (WebCore::FrameLoaderClientQt::userAgent):

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

WebKit/gtk/ChangeLog
WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
WebKit/qt/ChangeLog
WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

index b373d5d..64af2fa 100644 (file)
@@ -3,6 +3,13 @@
         Build fix.
 
         * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::didChangeTitle):
+
+2007-12-12  Sam Weinig  <sam@webkit.org>
+
+        Build fix.
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
         (WebKit::FrameLoaderClient::dispatchDecidePolicyForNavigationAction):
 
 2007-12-11  George Wright  <george.wright@collabora.co.uk>
index 5a2c6df..0aa2c84 100644 (file)
@@ -469,7 +469,7 @@ void FrameLoaderClient::dispatchDidLoadMainResource(DocumentLoader*) { notImplem
 void FrameLoaderClient::revertToProvisionalState(DocumentLoader*) { notImplemented(); }
 void FrameLoaderClient::clearUnarchivingState(DocumentLoader*) { notImplemented(); }
 void FrameLoaderClient::willChangeTitle(DocumentLoader*) { notImplemented(); }
-void FrameLoaderClient::didChangeTitle(DocumentLoader *l) { setTitle(l->title(), l->URL()); }
+void FrameLoaderClient::didChangeTitle(DocumentLoader *l) { setTitle(l->title(), l->url()); }
 void FrameLoaderClient::finalSetupForReplace(DocumentLoader*) { notImplemented(); }
 void FrameLoaderClient::setDefersLoading(bool) { notImplemented(); }
 bool FrameLoaderClient::isArchiveLoadPending(ResourceLoader*) const { notImplemented(); return false; }
index 04e788a..84c904c 100644 (file)
@@ -2,6 +2,13 @@
 
         Build fix.
 
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::userAgent):
+
+2007-12-12  Sam Weinig  <sam@webkit.org>
+
+        Build fix.
+
         * Api/qwebnetworkinterface.cpp:
         (QWebNetworkRequestPrivate::init):
         * Api/qwebpage.cpp:
index 3b7241d..702a14e 100644 (file)
@@ -544,7 +544,7 @@ void FrameLoaderClientQt::setTitle(const String&, const KURL&)
 String FrameLoaderClientQt::userAgent(const KURL& url)
 {
     if (m_webFrame) {
-        return m_webFrame->page()->userAgentFor(QUrl((QString)url.url()));
+        return m_webFrame->page()->userAgentFor(QUrl((QString)url.string()));
     }
     return String();
 }