[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 0c199c24df157a01c69a79c4280dd76f3c617ce3
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 25 17:50:16 2010 +0000

    2010-11-25  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r72732.
            http://trac.webkit.org/changeset/72732
            https://bugs.webkit.org/show_bug.cgi?id=50089
    
            Made Qt bot sad and crashy (Requested by Ossy on #webkit).
    
            * platform/network/qt/QNetworkReplyHandler.cpp:
            (WebCore::QNetworkReplyHandler::QNetworkReplyHandler):
            * platform/network/qt/QNetworkReplyHandler.h:
            * platform/network/qt/ResourceHandleQt.cpp:
            (WebCore::WebCoreSynchronousLoader::didFinishLoading):
            (WebCore::WebCoreSynchronousLoader::didFail):
            (WebCore::ResourceHandle::loadResourceSynchronously):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72736 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c2f9a37..3bc7c0a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,21 @@
 2010-11-25  Sheriff Bot  <webkit.review.bot at gmail.com>
 
+        Unreviewed, rolling out r72732.
+        http://trac.webkit.org/changeset/72732
+        https://bugs.webkit.org/show_bug.cgi?id=50089
+
+        Made Qt bot sad and crashy (Requested by Ossy on #webkit).
+
+        * platform/network/qt/QNetworkReplyHandler.cpp:
+        (WebCore::QNetworkReplyHandler::QNetworkReplyHandler):
+        * platform/network/qt/QNetworkReplyHandler.h:
+        * platform/network/qt/ResourceHandleQt.cpp:
+        (WebCore::WebCoreSynchronousLoader::didFinishLoading):
+        (WebCore::WebCoreSynchronousLoader::didFail):
+        (WebCore::ResourceHandle::loadResourceSynchronously):
+
+2010-11-25  Sheriff Bot  <webkit.review.bot at gmail.com>
+
         Unreviewed, rolling out r72734.
         http://trac.webkit.org/changeset/72734
         https://bugs.webkit.org/show_bug.cgi?id=50086
diff --git a/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
index 0ee5c0b..01e624e 100644
--- a/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
+++ b/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
@@ -51,10 +51,6 @@
 #define SIGNAL_CONN Qt::QueuedConnection
 #endif
 
-// In Qt 4.8, the attribute for sending a request synchronously will be made public,
-// for now, use this hackish solution for setting the internal attribute.
-const QNetworkRequest::Attribute gSynchronousNetworkRequestAttribute = static_cast<QNetworkRequest::Attribute>(QNetworkRequest::HttpPipeliningWasUsedAttribute + 7);
-
 static const int gMaxRecursionLimit = 10;
 
 namespace WebCore {
@@ -222,11 +218,6 @@ QNetworkReplyHandler::QNetworkReplyHandler(ResourceHandle* handle, LoadMode load
 
     m_request = r.toNetworkRequest(originatingObject);
 
-    if (m_loadMode == LoadSynchronously) {
-        m_request.setAttribute(gSynchronousNetworkRequestAttribute, true);
-        m_loadMode = LoadNormal;
-    }
-
     if (m_loadMode == LoadNormal)
         start();
 }
diff --git a/WebCore/platform/network/qt/QNetworkReplyHandler.h b/WebCore/platform/network/qt/QNetworkReplyHandler.h
index c0c2630..884a1a4 100644
--- a/WebCore/platform/network/qt/QNetworkReplyHandler.h
+++ b/WebCore/platform/network/qt/QNetworkReplyHandler.h
@@ -42,8 +42,7 @@ public:
     enum LoadMode {
         LoadNormal,
         LoadDeferred,
-        LoadResuming,
-        LoadSynchronously
+        LoadResuming
     };
 
     QNetworkReplyHandler(ResourceHandle *handle, LoadMode);
@@ -58,7 +57,7 @@ public:
 signals:
     void processQueuedItems();
 
-public slots:
+private slots:
     void finish();
     void sendResponseIfNeeded();
     void forwardData();
diff --git a/WebCore/platform/network/qt/ResourceHandleQt.cpp b/WebCore/platform/network/qt/ResourceHandleQt.cpp
index 46d544d..a5ac4c3 100644
--- a/WebCore/platform/network/qt/ResourceHandleQt.cpp
+++ b/WebCore/platform/network/qt/ResourceHandleQt.cpp
@@ -69,18 +69,14 @@ public:
     ResourceError resourceError() const { return m_error; }
     Vector<char> data() const { return m_data; }
 
-    void setReplyFinished(bool finished) { m_replyFinished = finished; }
-
 private:
     ResourceResponse m_response;
     ResourceError m_error;
     Vector<char> m_data;
     QEventLoop m_eventLoop;
-    bool m_replyFinished;
 };
 
 WebCoreSynchronousLoader::WebCoreSynchronousLoader()
-        : m_replyFinished(false)
 {
 }
 
@@ -96,15 +92,13 @@ void WebCoreSynchronousLoader::didReceiveData(ResourceHandle*, const char* data,
 
 void WebCoreSynchronousLoader::didFinishLoading(ResourceHandle*, double)
 {
-    if (!m_replyFinished)
-        m_eventLoop.exit();
+    m_eventLoop.exit();
 }
 
 void WebCoreSynchronousLoader::didFail(ResourceHandle*, const ResourceError& error)
 {
     m_error = error;
-    if (!m_replyFinished)
-        m_eventLoop.exit();
+    m_eventLoop.exit();
 }
 
 void WebCoreSynchronousLoader::waitForCompletion()
@@ -207,17 +201,9 @@ void ResourceHandle::loadResourceSynchronously(NetworkingContext* context, const
         d->m_firstRequest.setURL(urlWithCredentials);
     }
     d->m_context = context;
-    d->m_job = new QNetworkReplyHandler(handle.get(), QNetworkReplyHandler::LoadSynchronously);
-
-    QNetworkReply* reply = d->m_job->reply();
-    // When using synchronous calls, we are finished when reaching this point.
-    if (reply->isFinished()) {
-        syncLoader.setReplyFinished(true);
-        d->m_job->forwardData();
-        d->m_job->finish();
-    } else {
-        syncLoader.waitForCompletion();
-    }
+    d->m_job = new QNetworkReplyHandler(handle.get(), QNetworkReplyHandler::LoadNormal);
+
+    syncLoader.waitForCompletion();
     error = syncLoader.resourceError();
     data = syncLoader.data();
     response = syncLoader.resourceResponse();

-- 
WebKit Debian packaging