WebCore:
authorweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Dec 2007 08:13:01 +0000 (08:13 +0000)
committerweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Dec 2007 08:13:01 +0000 (08:13 +0000)
        Build fix for Qt, Gtk, and Wx.

        * css/CSSParser.cpp:
        (WebCore::CSSParser::parseValue):
        * loader/win/FrameLoaderWin.cpp:
        (WebCore::FrameLoader::urlSelected):
        * platform/network/curl/ResourceHandleManager.cpp:
        (WebCore::parseDataUrl):
        (WebCore::ResourceHandleManager::startJob):
        * platform/network/win/CookieJarWin.cpp:
        (WebCore::setCookies):
        (WebCore::cookies):
        * platform/network/win/ResourceHandleWin.cpp:
        (WebCore::ResourceHandle::start):
        * platform/qt/PasteboardQt.cpp:
        (WebCore::Pasteboard::writeURL):

WebKit/gtk:

        Build fix.

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

WebKit/qt:

        Build fix.

        * Api/qwebnetworkinterface.cpp:
        (QWebNetworkRequestPrivate::init):
        * Api/qwebpage.cpp:
        (QWebPage::url):
        (QWebPageContext::QWebPageContext):
        * Api/qwebpagehistory.cpp:
        (QWebHistoryItem::originalUrl):
        (QWebHistoryItem::currentUrl):
        * WebCoreSupport/FrameLoaderClientQt.cpp:
        (WebCore::FrameLoaderClientQt::cannotShowURLError):
        (WebCore::FrameLoaderClientQt::interruptForPolicyChangeError):
        (WebCore::FrameLoaderClientQt::cannotShowMIMETypeError):
        (WebCore::FrameLoaderClientQt::fileDoesNotExistError):
        (WebCore::FrameLoaderClientQt::dispatchWillSendRequest):
        (WebCore::FrameLoaderClientQt::dispatchDidReceiveResponse):
        (WebCore::FrameLoaderClientQt::createPlugin):

WebKit/wx:

        Build fix.

        * WebKitSupport/ChromeClientWx.cpp:
        (WebCore::ChromeClientWx::createWindow):
        * WebKitSupport/FrameLoaderClientWx.cpp:
        (WebCore::FrameLoaderClientWx::dispatchDidStartProvisionalLoad):
        (WebCore::FrameLoaderClientWx::dispatchDidCommitLoad):
        (WebCore::FrameLoaderClientWx::dispatchDidFinishDocumentLoad):
        (WebCore::FrameLoaderClientWx::postProgressFinishedNotification):
        (WebCore::FrameLoaderClientWx::didChangeTitle):
        (WebCore::FrameLoaderClientWx::dispatchDecidePolicyForNavigationAction):

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

17 files changed:
WebCore/ChangeLog
WebCore/css/CSSParser.cpp
WebCore/loader/win/FrameLoaderWin.cpp
WebCore/platform/network/curl/ResourceHandleManager.cpp
WebCore/platform/network/win/CookieJarWin.cpp
WebCore/platform/network/win/ResourceHandleWin.cpp
WebCore/platform/qt/PasteboardQt.cpp
WebKit/gtk/ChangeLog
WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
WebKit/qt/Api/qwebnetworkinterface.cpp
WebKit/qt/Api/qwebpage.cpp
WebKit/qt/Api/qwebpagehistory.cpp
WebKit/qt/ChangeLog
WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
WebKit/wx/ChangeLog
WebKit/wx/WebKitSupport/ChromeClientWx.cpp
WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp

index 44cffba..e5c6b37 100644 (file)
@@ -1,3 +1,22 @@
+2007-12-12  Sam Weinig  <sam@webkit.org>
+
+        Build fix for Qt, Gtk, and Wx.
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseValue):
+        * loader/win/FrameLoaderWin.cpp:
+        (WebCore::FrameLoader::urlSelected):
+        * platform/network/curl/ResourceHandleManager.cpp:
+        (WebCore::parseDataUrl):
+        (WebCore::ResourceHandleManager::startJob):
+        * platform/network/win/CookieJarWin.cpp:
+        (WebCore::setCookies):
+        (WebCore::cookies):
+        * platform/network/win/ResourceHandleWin.cpp:
+        (WebCore::ResourceHandle::start):
+        * platform/qt/PasteboardQt.cpp:
+        (WebCore::Pasteboard::writeURL):
+
 2007-12-11  Dan Bernstein  <mitz@apple.com>
 
         Reviewed by Maciej Stachowiak.
index b0a844c..fc543a6 100644 (file)
@@ -1089,7 +1089,7 @@ bool CSSParser::parseValue(int propId, bool important)
                 if (val->unit == CSSPrimitiveValue::CSS_URI) {
                     String value = parseURL(domString(val->string));
                     parsedValue = new CSSPrimitiveValue(
-                                    String(KURL(styleElement->baseURL().deprecatedString(), value.deprecatedString()).url()), 
+                                    KURL(styleElement->baseURL().deprecatedString(), value.deprecatedString()).string(), 
                                     CSSPrimitiveValue::CSS_URI);
                 } 
                 
index 3b108cd..66aa6ff 100644 (file)
@@ -39,7 +39,7 @@ void FrameLoader::urlSelected(const FrameLoadRequest& request, Event* /*triggeri
 {
     FrameWin* frameWin = static_cast<FrameWin*>(m_frame);
     if (frameWin->client())
-        frameWin->client()->openURL(request.resourceRequest().url().url(), request.lockHistory());
+        frameWin->client()->openURL(request.resourceRequest().url().string(), request.lockHistory());
 }
 
 void FrameLoader::submitForm(const FrameLoadRequest& request, Event*)
index 936c114..dbe90fb 100644 (file)
@@ -358,7 +358,7 @@ bool ResourceHandleManager::startScheduledJobs()
 
 static void parseDataUrl(ResourceHandle* handle)
 {
-    DeprecatedString data = handle->request().url().url();
+    DeprecatedString data = handle->request().url().deprecatedString();
 
     ASSERT(data.startsWith("data:", false));
 
@@ -418,7 +418,7 @@ void ResourceHandleManager::startJob(ResourceHandle* job)
     }
 
     ResourceHandleInternal* d = job->getInternal();
-    DeprecatedString url = kurl.url();
+    DeprecatedString url = kurl.deprecatedString();
 
     if (kurl.isLocalFile()) {
         DeprecatedString query = kurl.query();
@@ -491,7 +491,7 @@ void ResourceHandleManager::startJob(ResourceHandle* job)
     // timeout will occur and do curl_multi_perform
     if (ret && ret != CURLM_CALL_MULTI_PERFORM) {
 #ifndef NDEBUG
-        printf("Error %d starting job %s\n", ret, job->request().url().url().ascii());
+        printf("Error %d starting job %s\n", ret, job->request().url().deprecatedString().ascii());
 #endif
         job->cancel();
         return;
index 2cc77e0..d6085f2 100644 (file)
@@ -74,7 +74,7 @@ void setCookies(const KURL& url, const KURL& policyURL, const String& value)
     CFHTTPCookieStorageSetCookies(defaultCookieStorage, cookiesCF.get(), urlCF.get(), policyURLCF.get());
 #else
     // FIXME: Deal with the policy URL.
-    DeprecatedString str = url.url();
+    DeprecatedString str = url.deprecatedString();
     str.append((UChar)'\0');
     DeprecatedString val = value.deprecatedString();
     val.append((UChar)'\0');
@@ -109,7 +109,7 @@ String cookies(const KURL& url)
 
     return (CFStringRef)CFDictionaryGetValue(headerCF.get(), s_cookieCF);
 #else
-    DeprecatedString str = url.url();
+    DeprecatedString str = url.deprecatedString();
     str.append((UChar)'\0');
 
     DWORD count = str.length();
index 2ffe14a..260652e 100644 (file)
@@ -381,7 +381,7 @@ bool ResourceHandle::start(Frame* frame)
                                          INTERNET_SERVICE_HTTP,
                                          flags, (DWORD_PTR)d->m_jobId);
         } else {
-            DeprecatedString urlStr = url().url();
+            DeprecatedString urlStr = url().deprecatedString();
             int fragmentIndex = urlStr.find('#');
             if (fragmentIndex != -1)
                 urlStr = urlStr.left(fragmentIndex);
index 697f5e7..22806ea 100644 (file)
@@ -107,7 +107,7 @@ void Pasteboard::writeURL(const KURL& _url, const String&, Frame*)
     ASSERT(!_url.isEmpty());
 
     QMimeData* md = new QMimeData;
-    QString url = _url.url();
+    QString url = _url.string();
     md->setText(url);
     md->setUrls(QList<QUrl>() << QUrl(url));
     QApplication::clipboard()->setMimeData(md, QClipboard::Clipboard);
index c680385..b373d5d 100644 (file)
@@ -1,3 +1,10 @@
+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>
 
         Reviewed by Alp Toker.
index ea54d85..5a2c6df 100644 (file)
@@ -255,7 +255,7 @@ void FrameLoaderClient::dispatchDecidePolicyForNavigationAction(FramePolicyFunct
         return;
 
     WebKitWebView* page = getViewFromFrame(m_frame);
-    WebKitNetworkRequest* request = webkit_network_request_new(resourceRequest.url().url().utf8().data());
+    WebKitNetworkRequest* request = webkit_network_request_new(resourceRequest.url().string().utf8().data());
     WebKitNavigationResponse response;
 
     g_signal_emit_by_name(page, "navigation-requested", m_frame, request, &response);
index 717f6a0..9a72c84 100644 (file)
@@ -106,7 +106,7 @@ static QByteArray decodePercentEncoding(const QByteArray& input)
 void QWebNetworkRequestPrivate::init(const WebCore::ResourceRequest &resourceRequest)
 {
     KURL url = resourceRequest.url();
-    QUrl qurl = QString(url.url());
+    QUrl qurl = QString(url.string());
     init(resourceRequest.httpMethod(), qurl, &resourceRequest);
 }
 
index 0f8b613..86b2236 100644 (file)
@@ -345,7 +345,7 @@ void QWebPage::open(const QWebNetworkRequest &req)
 
 QUrl QWebPage::url() const
 {
-    return QUrl((QString)mainFrame()->d->frame->loader()->url().url());
+    return QUrl((QString)mainFrame()->d->frame->loader()->url().string());
 }
 
 QString QWebPage::title() const
@@ -1278,8 +1278,8 @@ QWebPageContext::QWebPageContext(const WebCore::HitTestResult &hitTest)
 {
     d->pos = hitTest.point();
     d->text = hitTest.textContent();
-    d->linkUrl = hitTest.absoluteLinkURL().url();
-    d->imageUrl = hitTest.absoluteImageURL().url();
+    d->linkUrl = hitTest.absoluteLinkURL().string();
+    d->imageUrl = hitTest.absoluteImageURL().string();
     d->innerNonSharedNode = hitTest.innerNonSharedNode();
     WebCore::Image *img = hitTest.image();
     if (img) {
index c6a2b2b..2c95223 100644 (file)
@@ -45,13 +45,13 @@ QWebHistoryItem::~QWebHistoryItem()
 
 QUrl QWebHistoryItem::originalUrl() const
 {
-    return QUrl(d->item->originalURL().url());
+    return QUrl(d->item->originalURL().string());
 }
 
 
 QUrl QWebHistoryItem::currentUrl() const
 {
-    return QUrl(d->item->url().url());
+    return QUrl(d->item->url().string());
 }
 
 
index 9a4bdf8..04e788a 100644 (file)
@@ -1,3 +1,24 @@
+2007-12-12  Sam Weinig  <sam@webkit.org>
+
+        Build fix.
+
+        * Api/qwebnetworkinterface.cpp:
+        (QWebNetworkRequestPrivate::init):
+        * Api/qwebpage.cpp:
+        (QWebPage::url):
+        (QWebPageContext::QWebPageContext):
+        * Api/qwebpagehistory.cpp:
+        (QWebHistoryItem::originalUrl):
+        (QWebHistoryItem::currentUrl):
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::cannotShowURLError):
+        (WebCore::FrameLoaderClientQt::interruptForPolicyChangeError):
+        (WebCore::FrameLoaderClientQt::cannotShowMIMETypeError):
+        (WebCore::FrameLoaderClientQt::fileDoesNotExistError):
+        (WebCore::FrameLoaderClientQt::dispatchWillSendRequest):
+        (WebCore::FrameLoaderClientQt::dispatchDidReceiveResponse):
+        (WebCore::FrameLoaderClientQt::createPlugin):
+
 2007-12-07  Alexey Proskuryakov  <ap@webkit.org>
 
         Reviewed by Darin.
index 310dd88..3b7241d 100644 (file)
@@ -669,22 +669,22 @@ WebCore::ResourceError FrameLoaderClientQt::blockedError(const WebCore::Resource
 
 WebCore::ResourceError FrameLoaderClientQt::cannotShowURLError(const WebCore::ResourceRequest& request)
 {
-    return ResourceError("Error", WebKitErrorCannotShowURL, request.url().url(), QObject::tr("QWebFrame", "Cannot show URL"));
+    return ResourceError("Error", WebKitErrorCannotShowURL, request.url().string(), QObject::tr("QWebFrame", "Cannot show URL"));
 }
 
 WebCore::ResourceError FrameLoaderClientQt::interruptForPolicyChangeError(const WebCore::ResourceRequest& request)
 {
-    return ResourceError("Error", WebKitErrorFrameLoadInterruptedByPolicyChange, request.url().url(), QObject::tr("QWebFrame", "Frame load interruped by policy change"));
+    return ResourceError("Error", WebKitErrorFrameLoadInterruptedByPolicyChange, request.url().string(), QObject::tr("QWebFrame", "Frame load interruped by policy change"));
 }
 
 WebCore::ResourceError FrameLoaderClientQt::cannotShowMIMETypeError(const WebCore::ResourceResponse& response)
 {
-    return ResourceError("Error", WebKitErrorCannotShowMIMEType, response.url().url(), QObject::tr("QWebFrame", "Cannot show mimetype"));
+    return ResourceError("Error", WebKitErrorCannotShowMIMEType, response.url().string(), QObject::tr("QWebFrame", "Cannot show mimetype"));
 }
 
 WebCore::ResourceError FrameLoaderClientQt::fileDoesNotExistError(const WebCore::ResourceResponse& response)
 {
-    return ResourceError("Error", -998 /* ### */, response.url().url(), QObject::tr("QWebFrame", "File does not exist"));
+    return ResourceError("Error", -998 /* ### */, response.url().string(), QObject::tr("QWebFrame", "File does not exist"));
 }
 
 bool FrameLoaderClientQt::shouldFallBack(const WebCore::ResourceError&)
@@ -712,7 +712,7 @@ void FrameLoaderClientQt::assignIdentifierToInitialRequest(unsigned long identif
 void FrameLoaderClientQt::dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long, WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response)
 {
     // seems like the Mac code doesn't do anything here by default neither
-    //qDebug() << "FrameLoaderClientQt::dispatchWillSendRequest" << request.isNull() << request.url().url();
+    //qDebug() << "FrameLoaderClientQt::dispatchWillSendRequest" << request.isNull() << request.url().string`();
 }
 
 void FrameLoaderClientQt::dispatchDidReceiveAuthenticationChallenge(DocumentLoader*, unsigned long, const AuthenticationChallenge&)
@@ -730,7 +730,7 @@ void FrameLoaderClientQt::dispatchDidReceiveResponse(WebCore::DocumentLoader*, u
 
     m_response = response;
     m_firstData = true;
-    //qDebug() << "    got response from" << response.url().url();
+    //qDebug() << "    got response from" << response.url().string();
 }
 
 void FrameLoaderClientQt::dispatchDidReceiveContentLength(WebCore::DocumentLoader*, unsigned long, int)
@@ -915,7 +915,7 @@ Widget* FrameLoaderClientQt::createPlugin(const IntSize&, Element* element, cons
     for (int i = 0; i < paramValues.size(); ++i)
         values.append(paramValues[i]);
 
-    QString urlStr(url.url());
+    QString urlStr(url.string());
     QUrl qurl = urlStr;
 
     QObject *object = 0;
index b83e3f4..78b4498 100644 (file)
@@ -1,3 +1,17 @@
+2007-12-12  Sam Weinig  <sam@webkit.org>
+
+        Build fix.
+
+        * WebKitSupport/ChromeClientWx.cpp:
+        (WebCore::ChromeClientWx::createWindow):
+        * WebKitSupport/FrameLoaderClientWx.cpp:
+        (WebCore::FrameLoaderClientWx::dispatchDidStartProvisionalLoad):
+        (WebCore::FrameLoaderClientWx::dispatchDidCommitLoad):
+        (WebCore::FrameLoaderClientWx::dispatchDidFinishDocumentLoad):
+        (WebCore::FrameLoaderClientWx::postProgressFinishedNotification):
+        (WebCore::FrameLoaderClientWx::didChangeTitle):
+        (WebCore::FrameLoaderClientWx::dispatchDecidePolicyForNavigationAction):
+
 2007-12-07  Alexey Proskuryakov  <ap@webkit.org>
 
         Reviewed by Darin.
index 63f64e3..a528ac6 100644 (file)
@@ -110,7 +110,7 @@ Page* ChromeClientWx::createWindow(Frame*, const FrameLoadRequest& request, cons
     wxWebFrame* newFrame = new wxWebFrame(wxTheApp->GetAppName());
     
     if (newFrame->webview) {
-        newFrame->webview->LoadURL(request.resourceRequest().url().url());
+        newFrame->webview->LoadURL(request.resourceRequest().url().string());
         newFrame->Show(true);
 
         WebViewPrivate* impl = newFrame->webview->m_impl;
index dd4d0f6..40ad721 100644 (file)
@@ -297,7 +297,7 @@ void FrameLoaderClientWx::dispatchDidStartProvisionalLoad()
     if (target) {
         wxWebViewStateChangedEvent wkEvent(target);
         wkEvent.SetState(wxWEBVIEW_STATE_NEGOTIATING);
-        wkEvent.SetURL(m_frame->loader()->provisionalDocumentLoader()->request().url().url());
+        wkEvent.SetURL(m_frame->loader()->provisionalDocumentLoader()->request().url().string());
         target->GetEventHandler()->ProcessEvent(wkEvent);
     }
 }
@@ -317,7 +317,7 @@ void FrameLoaderClientWx::dispatchDidCommitLoad()
     if (target) {
         wxWebViewStateChangedEvent wkEvent(target);
         wkEvent.SetState(wxWEBVIEW_STATE_TRANSFERRING);
-        wkEvent.SetURL(m_frame->loader()->documentLoader()->request().url().url());
+        wkEvent.SetURL(m_frame->loader()->documentLoader()->request().url().string());
         target->GetEventHandler()->ProcessEvent(wkEvent);
     }
 }
@@ -328,7 +328,7 @@ void FrameLoaderClientWx::dispatchDidFinishDocumentLoad()
     if (target) {
         wxWebViewStateChangedEvent wkEvent(target);
         wkEvent.SetState(wxWEBVIEW_STATE_STOP);
-        wkEvent.SetURL(m_frame->loader()->URL().url());
+        wkEvent.SetURL(m_frame->loader()->url().string());
         target->GetEventHandler()->ProcessEvent(wkEvent);
     }
 }
@@ -400,7 +400,7 @@ void FrameLoaderClientWx::postProgressFinishedNotification()
     if (target) {
         wxWebViewStateChangedEvent wkEvent(target);
         wkEvent.SetState(wxWEBVIEW_STATE_STOP);
-        wkEvent.SetURL(m_frame->loader()->url().url());
+        wkEvent.SetURL(m_frame->loader()->url().string());
         target->GetEventHandler()->ProcessEvent(wkEvent);
     }
 }
@@ -432,7 +432,7 @@ void FrameLoaderClientWx::willChangeTitle(DocumentLoader*)
 
 void FrameLoaderClientWx::didChangeTitle(DocumentLoader *l)
 {
-    setTitle(l->title(), l->URL());
+    setTitle(l->title(), l->url());
 }
 
 
@@ -775,7 +775,7 @@ void FrameLoaderClientWx::dispatchDecidePolicyForNavigationAction(FramePolicyFun
     if (target) {
         wxWebViewBeforeLoadEvent wkEvent(target);
         wkEvent.SetNavigationType(wxNavTypeFromWebNavType(action.type()));
-        wkEvent.SetURL(request.url().url());
+        wkEvent.SetURL(request.url().string());
         
         target->GetEventHandler()->ProcessEvent(wkEvent);
         if (wkEvent.IsCancelled())