[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 216b123d508e49ce165c394bb2f4e262c91aaa14
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 29 18:29:26 2009 +0000

    2009-10-29  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Tor Arne Vestbø.
    
            [Qt] Implement DELETE HTTP method for XmlHttpRequest
            https://bugs.webkit.org/show_bug.cgi?id=30894
    
            No new tests as this functionality is already tested by the
            xmlhttprequest LayoutTests. As this patch depends on an unreleased
            version of the dependent QtNetwork library and the tests will be
            enabled later once the dependent library is released (and the
            buildbot is updated).
    
            * platform/network/qt/QNetworkReplyHandler.cpp:
            (WebCore::QNetworkReplyHandler::QNetworkReplyHandler):
            (WebCore::QNetworkReplyHandler::start):
    2009-10-29  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Tor Arne Vestbø.
    
            [Qt] Implement DELETE HTTP method for XmlHttpRequest
            https://bugs.webkit.org/show_bug.cgi?id=30894
    
            No new tests as this functionality is already tested by the
            xmlhttprequest LayoutTests. As this patch depends on an unreleased
            version of the dependent QtNetwork library and the tests will be
            enabled later once the dependent library is released (and the
            buildbot is updated).
    
            * Api/qwebframe.cpp:
            (QWebFrame::load):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50288 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 541c971..3441e0c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2009-10-29  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Implement DELETE HTTP method for XmlHttpRequest
+        https://bugs.webkit.org/show_bug.cgi?id=30894
+
+        No new tests as this functionality is already tested by the 
+        xmlhttprequest LayoutTests. As this patch depends on an unreleased
+        version of the dependent QtNetwork library and the tests will be
+        enabled later once the dependent library is released (and the
+        buildbot is updated).
+
+        * platform/network/qt/QNetworkReplyHandler.cpp:
+        (WebCore::QNetworkReplyHandler::QNetworkReplyHandler):
+        (WebCore::QNetworkReplyHandler::start):
+
 2009-10-29  Brian Weinstein  <bweinstein at apple.com>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
index ed5e024..d9653f1 100644
--- a/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
+++ b/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
@@ -140,6 +140,10 @@ QNetworkReplyHandler::QNetworkReplyHandler(ResourceHandle* handle, LoadMode load
         m_method = QNetworkAccessManager::PostOperation;
     else if (r.httpMethod() == "PUT")
         m_method = QNetworkAccessManager::PutOperation;
+#if QT_VERSION >= 0x040600
+    else if (r.httpMethod() == "DELETE")
+        m_method = QNetworkAccessManager::DeleteOperation;
+#endif
     else
         m_method = QNetworkAccessManager::UnknownOperation;
 
@@ -398,6 +402,12 @@ void QNetworkReplyHandler::start()
             putDevice->setParent(m_reply);
             break;
         }
+#if QT_VERSION >= 0x040600
+        case QNetworkAccessManager::DeleteOperation: {
+            m_reply = manager->deleteResource(m_request);
+            break;
+        }
+#endif
         case QNetworkAccessManager::UnknownOperation: {
             m_reply = 0;
             ResourceHandleClient* client = m_resourceHandle->client();
diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index 606dae4..17a0118 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -734,6 +734,11 @@ void QWebFrame::load(const QNetworkRequest &req,
         case QNetworkAccessManager::PostOperation:
             request.setHTTPMethod("POST");
             break;
+#if QT_VERSION >= 0x040600
+        case QNetworkAccessManager::DeleteOperation:
+            request.setHTTPMethod("DELETE");
+            break;
+#endif
         case QNetworkAccessManager::UnknownOperation:
             // eh?
             break;
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index b19a1d0..0614f44 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,19 @@
+2009-10-29  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Implement DELETE HTTP method for XmlHttpRequest
+        https://bugs.webkit.org/show_bug.cgi?id=30894
+
+        No new tests as this functionality is already tested by the
+        xmlhttprequest LayoutTests. As this patch depends on an unreleased
+        version of the dependent QtNetwork library and the tests will be
+        enabled later once the dependent library is released (and the
+        buildbot is updated).
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::load):
+
 2009-10-29  Kenneth Rohde Christiansen  <kenneth at webkit.org>
 
         Reviewed by Tor Arne Vestbø.

-- 
WebKit Debian packaging