2006-10-30 Zach Rusin <zack@kde.org>

        Reviewed and landed by Anders.

        * platform/network/qt/ResourceHandleQt.cpp:
        (WebCore::ResourceHandle::receivedResponse):
        * platform/qt/FrameQtClient.cpp:
        (WebCore::FrameQtClientDefault::FrameQtClientDefault):
        * platform/qt/LoaderFunctionsQt.cpp:
        (WebCore::ServeSynchronousRequest):
        More build fixes.

2006-10-30  Simon Hausmann  <hausmann@kde.org>

        Reviewed and landed by Anders.

        - fix Qt build
        * platform/qt/FrameQtClient.cpp: ResourceLoaderClient ->
        ResourceHandleClient

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 03669cc3fb113ceb89e7cca77f9754aedd9f1cfe..1109718e7c2683831ea3be28a5b9633a16e6f7bf 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2006-10-30  Zach Rusin  <zack@kde.org>
+
+        Reviewed and landed by Anders.
+
+        * platform/network/qt/ResourceHandleQt.cpp:
+        (WebCore::ResourceHandle::receivedResponse):
+        * platform/qt/FrameQtClient.cpp:
+        (WebCore::FrameQtClientDefault::FrameQtClientDefault):
+        * platform/qt/LoaderFunctionsQt.cpp:
+        (WebCore::ServeSynchronousRequest):
+        More build fixes.
+
+2006-10-30  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed and landed by Anders.
+        
+        - fix Qt build
+        * platform/qt/FrameQtClient.cpp: ResourceLoaderClient ->
+        ResourceHandleClient
+
 2006-10-30  Darin Adler  <darin@apple.com>
 
         Reviewed by John Sullivan.

diff --git a/WebCore/platform/network/qt/ResourceHandleQt.cpp b/WebCore/platform/network/qt/ResourceHandleQt.cpp
index e0b85bef534c41ebf42c42947bcb0f9c4cc0b69e..7d040876977afd6acb8acd247738ad68b5ae3b7a 100644 (file)
--- a/WebCore/platform/network/qt/ResourceHandleQt.cpp
+++ b/WebCore/platform/network/qt/ResourceHandleQt.cpp
@@ -22,7 +22,7 @@
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
@@ -68,30 +68,10 @@ void ResourceHandle::cancel()
     ResourceHandleManager::self()->cancel(this);
 }
 
-void ResourceHandle::assembleResponseHeaders() const
-{
-    if (!d->assembledResponseHeaders) {
-        ASSERT(d->m_response);
-
-        d->responseHeaders = d->m_response->data;
-        d->assembledResponseHeaders = true;
-    }
-}
-
-void ResourceHandle::retrieveResponseEncoding() const
-{
-    if (!d->m_retrievedResponseEncoding) {
-        d->m_responseEncoding = extractCharsetFromHeaders(d->responseHeaders);
-        d->m_retrievedResponseEncoding = true;
-    }
-}
-
 void ResourceHandle::receivedResponse(PlatformResponse response)
 {
     Q_ASSERT(method() == "POST");
 
-    d->assembledResponseHeaders = false;
-    d->m_retrievedResponseEncoding = false;
     d->m_response = response;
 
     if (d->m_client)

diff --git a/WebCore/platform/qt/FrameQtClient.cpp b/WebCore/platform/qt/FrameQtClient.cpp
index 9b3c0de9f638ae12991df31b13d82835a837373f..b0b0adaa099cbadc2af9405d835eb39fe94e395d 100644 (file)
--- a/WebCore/platform/qt/FrameQtClient.cpp
+++ b/WebCore/platform/qt/FrameQtClient.cpp
@@ -44,7 +44,7 @@ namespace WebCore {
 
 FrameQtClientDefault::FrameQtClientDefault()
     : FrameQtClient()
-    , ResourceLoaderClient()
+    , ResourceHandleClient()
     , m_frame(0)
     , m_assignedMimetype(false)
 {

diff --git a/WebCore/platform/qt/LoaderFunctionsQt.cpp b/WebCore/platform/qt/LoaderFunctionsQt.cpp
index e8d625f0ad6249d866b0683e57c9547383cdf86d..a6f5ad8bf094ae0499b8ad6efb36a0b4be40a75c 100644 (file)
--- a/WebCore/platform/qt/LoaderFunctionsQt.cpp
+++ b/WebCore/platform/qt/LoaderFunctionsQt.cpp
@@ -22,7 +22,7 @@
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
@@ -35,13 +35,16 @@
 #include "Cache.h"
 #include "loader.h"
 #include "FrameQt.h"
+#include "Request.h"
+#include "ResourceHandle.h"
+#include "ResourceRequest.h"
 #include "DocLoader.h"
 #include "CachedResource.h"
 #include "DeprecatedString.h"
 
 namespace WebCore {
 
-Vector<char> ServeSynchronousRequest(Loader*, DocLoader *docLoader, const ResourceRequest&, KURL& url, DeprecatedString&)
+Vector<char> ServeSynchronousRequest(Loader*, DocLoader *docLoader, const ResourceRequest& request, ResourceResponse&)
 {
     // FIXME: Handle last paremeter: "responseHeaders"
     FrameQt* frame = QtFrame(docLoader->frame());
@@ -51,7 +54,7 @@ Vector<char> ServeSynchronousRequest(Loader*, DocLoader *docLoader, const Resour
 
     // FIXME: We shouldn't use temporary files for sync jobs!
     QString tempFile;
-    if (!KIO::NetAccess::download(KUrl(url.url()), tempFile, 0))
+    if (!KIO::NetAccess::download(KUrl(request.url().url()), tempFile, 0))
         return Vector<char>();
 
     QFile file(tempFile);
@@ -64,7 +67,7 @@ Vector<char> ServeSynchronousRequest(Loader*, DocLoader *docLoader, const Resour
 
     QByteArray content = file.readAll();
     KIO::NetAccess::removeTempFile(tempFile);
-    
+
     Vector<char> resultBuffer;
     resultBuffer.append(content.data(), content.size());