From f067f7ce2491135850a421d012d228326f242abf Mon Sep 17 00:00:00 2001 From: "weinig@apple.com" Date: Wed, 12 Dec 2007 08:41:12 +0000 Subject: [PATCH] WebKit/gtk: 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 | 7 +++++++ WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp | 2 +- WebKit/qt/ChangeLog | 7 +++++++ WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog index b373d5d02450..64af2fa8f443 100644 --- a/WebKit/gtk/ChangeLog +++ b/WebKit/gtk/ChangeLog @@ -1,3 +1,10 @@ +2007-12-12 Sam Weinig + + Build fix. + + * WebCoreSupport/FrameLoaderClientGtk.cpp: + (WebKit::FrameLoaderClient::didChangeTitle): + 2007-12-12 Sam Weinig Build fix. diff --git a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp index 5a2c6df2d99e..0aa2c8494dbc 100644 --- a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp +++ b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp @@ -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; } diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog index 04e788adf663..84c904cdf01d 100644 --- a/WebKit/qt/ChangeLog +++ b/WebKit/qt/ChangeLog @@ -1,3 +1,10 @@ +2007-12-12 Sam Weinig + + Build fix. + + * WebCoreSupport/FrameLoaderClientQt.cpp: + (WebCore::FrameLoaderClientQt::userAgent): + 2007-12-12 Sam Weinig Build fix. diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp index 3b7241dcbeee..702a14e625b8 100644 --- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp +++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp @@ -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(); } -- 2.36.0