WebCore:
authorweinig <weinig@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 26 Oct 2006 18:25:07 +0000 (18:25 +0000)
committerweinig <weinig@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 26 Oct 2006 18:25:07 +0000 (18:25 +0000)
        Reviewed by Darin.

        Fix Qt/Linux build.

        * platform/network/qt/ResourceLoaderManager.cpp:
        (WebCore::ResourceLoaderManager::slotData):
        (WebCore::ResourceLoaderManager::slotMimetype):
        (WebCore::ResourceLoaderManager::remove):
        (WebCore::ResourceLoaderManager::add):
        * platform/network/qt/ResourceLoaderQt.cpp:
        (WebCore::ResourceLoader::receivedResponse):
        * platform/qt/FrameQtClient.cpp:
        (WebCore::FrameQtClientDefault::openURL):
        * platform/qt/LoaderFunctionsQt.cpp:
        (WebCore::ServeSynchronousRequest):

WebKitQt:

        Reviewed by Darin.

        Fix Qt/Linux build.

        * QtLauncher/main.cpp:
        (main):
        * WebKitPart/WebKitPart.cpp:
        (WebKitPart::openUrl):

WebKitTools:

        Reviewed by Darin.

        Fix Qt/Linux build.

        * DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.cpp:
        (WebCore::DumpRenderTree::open):

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

WebCore/ChangeLog
WebCore/platform/network/qt/ResourceLoaderManager.cpp
WebCore/platform/network/qt/ResourceLoaderQt.cpp
WebCore/platform/qt/FrameQtClient.cpp
WebCore/platform/qt/LoaderFunctionsQt.cpp
WebKitQt/ChangeLog
WebKitQt/QtLauncher/main.cpp
WebKitQt/WebKitPart/WebKitPart.cpp
WebKitTools/ChangeLog
WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.cpp

index e5cc31cf391cdf8970bcff6ced01ba6ecb34f536..e5f278944332fea2b0a204adc3baafaf8eb24808 100644 (file)
@@ -1,3 +1,21 @@
+2006-10-26  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by Darin.
+
+        Fix Qt/Linux build.
+
+        * platform/network/qt/ResourceLoaderManager.cpp:
+        (WebCore::ResourceLoaderManager::slotData):
+        (WebCore::ResourceLoaderManager::slotMimetype):
+        (WebCore::ResourceLoaderManager::remove):
+        (WebCore::ResourceLoaderManager::add):
+        * platform/network/qt/ResourceLoaderQt.cpp:
+        (WebCore::ResourceLoader::receivedResponse):
+        * platform/qt/FrameQtClient.cpp:
+        (WebCore::FrameQtClientDefault::openURL):
+        * platform/qt/LoaderFunctionsQt.cpp:
+        (WebCore::ServeSynchronousRequest):
+
 2006-10-26  Adam Roben  <aroben@apple.com>
 
         Reviewed by Adele.
index ea411aaebf173eb01f231b39bd044879f5c9ca67..6b614b7f7e08ad045569f00b24edc2c08ff62822 100644 (file)
@@ -69,10 +69,10 @@ void ResourceLoaderManager::slotData(KIO::Job* kioJob, const QByteArray& data)
         return;
 
     ResourceLoaderInternal* d = job->getInternal();
-    if (!d || !d->client)
+    if (!d || !d->m_client)
         return;
 
-    d->client->didReceiveData(job, data.data(), data.size());
+    d->m_client->didReceiveData(job, data.data(), data.size());
 }
 
 void ResourceLoaderManager::slotMimetype(KIO::Job* kioJob, const QString& type)
@@ -88,7 +88,7 @@ void ResourceLoaderManager::slotMimetype(KIO::Job* kioJob, const QString& type)
         return;
 
     ResourceLoaderInternal* d = job->getInternal();
-    if (!d || !d->client)
+    if (!d || !d->m_client)
         return;
 
     d->m_mimetype = type;
@@ -120,7 +120,7 @@ void ResourceLoaderManager::slotResult(KJob* kjob)
 void ResourceLoaderManager::remove(ResourceLoader* job)
 {
     ResourceLoaderInternal* d = job->getInternal();
-    if (!d || !d->client)
+    if (!d || !d->m_client)
         return;
 
     KIO::Job* kioJob = 0;
@@ -147,8 +147,8 @@ void ResourceLoaderManager::remove(ResourceLoader* job)
         job->receivedResponse(response);
     }
 
-    d->client->receivedAllData(job, 0);
-    d->client->didFinishLoading(job);
+    d->m_client->receivedAllData(job, 0);
+    d->m_client->didFinishLoading(job);
 
     m_jobToKioMap.remove(job);
     m_kioToJobMap.remove(kioJob);
@@ -157,7 +157,7 @@ void ResourceLoaderManager::remove(ResourceLoader* job)
 void ResourceLoaderManager::add(ResourceLoader* job, FrameQtClient* frameClient)
 {
     ResourceLoaderInternal* d = job->getInternal();
-    DeprecatedString url = d->URL.url();
+    DeprecatedString url = d->m_request.url().url();
 
     KIO::Job* kioJob = 0;
 
index 3d1734200c7a206836a63c17206e736dd07a3d7a..c9c40bf74c4f147c88618339bc1adca412a77adc 100644 (file)
@@ -94,8 +94,8 @@ void ResourceLoader::receivedResponse(PlatformResponse response)
     d->m_retrievedResponseEncoding = false;
     d->m_response = response;
 
-    if (d->client)
-        d->client->receivedResponse(const_cast<ResourceLoader*>(this), response);
+    if (d->m_client)
+        d->m_client->receivedResponse(const_cast<ResourceLoader*>(this), response);
 }
 
 QString ResourceLoader::extractCharsetFromHeaders(QString headers) const
index eb4fa5515d5864cd311aecb3ddae12aa959c8f89..1e426db7b4a2e0986ceed0c20b76bbe848df0209 100644 (file)
@@ -66,7 +66,7 @@ void FrameQtClientDefault::openURL(const KURL& url)
     m_frame->didOpenURL(url);
     m_assignedMimetype = false;
 
-    RequestRequest request(url);
+    ResourceRequest request(url);
     RefPtr<ResourceLoader> loader = ResourceLoader::create(request, this, m_frame->document() ? m_frame->document()->docLoader() : 0);
 }
 
index 4fd91c123b0982a36b2b248c33e662e7eeffba8c..086240a0d00cf954d19477d5098144aecf256d52 100644 (file)
@@ -41,7 +41,7 @@
 
 namespace WebCore {
 
-Vector<char> ServeSynchronousRequest(Loader*, DocLoader* docLoader, ResourceLoader*, KURL& url, DeprecatedString&)
+Vector<char> ServeSynchronousRequest(Loader*, DocLoader *docLoader, const ResourceRequest&, KURL& url, DeprecatedString&)
 {
     // FIXME: Handle last paremeter: "responseHeaders"
     FrameQt* frame = QtFrame(docLoader->frame());
index ea73e16e9eb31686879c0a0e8cb2006b2643179a..c0cbf9ae92c2e408cbab6135a9b205a4707d62c0 100644 (file)
@@ -1,3 +1,14 @@
+2006-10-26  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by Darin.
+
+        Fix Qt/Linux build.
+
+        * QtLauncher/main.cpp:
+        (main):
+        * WebKitPart/WebKitPart.cpp:
+        (WebKitPart::openUrl):
+
 2006-10-24  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed by Maciej.
index 9580b32da60a093e743b3ab9abd997c209fc974b..479cea0b3a3b5ee642f03736f1aef53bd28a5efc 100644 (file)
@@ -82,7 +82,7 @@ int main(int argc, char **argv)
     else
         url = args->arg(0);
 
-    frame->openURL(KURL(url.toLatin1()));
+    QtFrame(frame)->client()->openURL(KURL(url.toLatin1()));
     
     app.exec();
     delete frame;
index e699445a856465749eab1ffa87bb586e95d621da..27fe9a111c415e205880b34cfe77d05f72c45f45 100644 (file)
@@ -66,8 +66,12 @@ bool WebKitPart::openFile()
 
 bool WebKitPart::openUrl(const KUrl& url)
 {
+    if (!m_client)
+        return false;
+
     emit started(0);
-    return m_frame->openURL(KURL(url.toEncoded()));
+    m_client->openURL(KURL(url.toEncoded()));
+    return true;
 }
 
 bool WebKitPart::closeUrl()
index d919296152f088d381811ae1d1095f7b0fa56623..c6e2a223281442ffe9ff1252f6f4cc75e89c7d3b 100644 (file)
@@ -1,3 +1,12 @@
+2006-10-26  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by Darin.
+
+        Fix Qt/Linux build.
+
+        * DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.cpp:
+        (WebCore::DumpRenderTree::open):
+
 2006-10-24  Stephanie Lewis  <slewis@apple.com>
 
         Reviewed by Maciej.
index 886266de04901305bcba41498a02490ee198d0fd..f92f8da08c1ed948bfb80bfe212dc9b203db1a9b 100644 (file)
@@ -111,7 +111,7 @@ void DumpRenderTree::open(const KURL& url)
         return;
     }
 
-    m_frame->openURL(url);
+    m_frame->client()->openURL(url);
 
     // Simple poll mechanism, to find out when the page is loaded...
     checkLoaded();