WebCore/ChangeLog

2010-11-24  Peter Hartmann  <peter.hartmann@nokia.com>

        Reviewed by NOBODY (OOPS!).

        [Qt] enable usage of synchronous HTTP feature in Qt

        https://bugs.webkit.org/show_bug.cgi?id=37191

        Currently, we spin an event loop when doing synchronous calls to

        wait for completion. This patch uses synchronous requests in Qt,

        if available, and spins the event loop as a fallback solution.

        * platform/network/qt/QNetworkReplyHandler.cpp:

        (WebCore::QNetworkReplyHandler::QNetworkReplyHandler):

        * platform/network/qt/QNetworkReplyHandler.h:

        * platform/network/qt/ResourceHandleQt.cpp:

        (WebCore::WebCoreSynchronousLoader::setReplyFinished):

        (WebCore::WebCoreSynchronousLoader::WebCoreSynchronousLoader):

        (WebCore::WebCoreSynchronousLoader::didFinishLoading):

        (WebCore::WebCoreSynchronousLoader::didFail):

        (WebCore::WebCoreSynchronousLoader::waitForCompletion):

        (WebCore::ResourceHandle::loadResourceSynchronously):

2010-11-12  Stephen White  <senorblanco@chromium.org>

        Reviewed by Simon Fraser.

WebCore/platform/network/qt/QNetworkReplyHandler.cpp

#define SIGNAL_CONN Qt::QueuedConnection

#endif

56const QNetworkRequest::Attribute gSynchronousNetworkRequestAttribute = static_cast<QNetworkRequest::Attribute>(QNetworkRequest::DownloadBufferAttribute + 1);

57

static const int gMaxRecursionLimit = 10;

namespace WebCore {

@@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();

}

WebCore/platform/network/qt/QNetworkReplyHandler.h

@@public:

    enum LoadMode {

        LoadNormal,

        LoadDeferred,

45 LoadResuming

45 LoadResuming,

46 LoadSynchronously

    };

    QNetworkReplyHandler(ResourceHandle *handle, LoadMode);

@@public:

signals:

    void processQueuedItems();

60 pr~~ivate~~ slots:

61public slots:

    void finish();

    void sendResponseIfNeeded();

    void forwardData();

WebCore/platform/network/qt/ResourceHandleQt.cpp

@@public:

    ResourceError resourceError() const { return m_error; }

    Vector<char> data() const { return m_data; }

70 void setReplyFinished(bool finished) { m_replyFinished = finished; }

71

private:

    ResourceResponse m_response;

    ResourceError m_error;

    Vector<char> m_data;

    QEventLoop m_eventLoop;

77 bool m_replyFinished;

};

WebCoreSynchronousLoader::WebCoreSynchronousLoader()

81 : m_replyFinished(false)

{

}

@@void WebCoreSynchronousLoader::didReceiveData(ResourceHandle*, const char* data,

void WebCoreSynchronousLoader::didFinishLoading(ResourceHandle*, double)

{

93 m_eventLoop.exit();

97 if (!m_replyFinished)

98 m_eventLoop.exit();

}

void WebCoreSynchronousLoader::didFail(ResourceHandle*, const ResourceError& error)

{

    m_error = error;

99 m_eventLoop.exit();

104 if (!m_replyFinished)

105 m_eventLoop.exit();

}

void WebCoreSynchronousLoader::waitForCompletion()

{

104 m_eventLoop.exec(QEventLoop::ExcludeUserInputEvents);

110 if (!m_replyFinished)

111 m_eventLoop.exec(QEventLoop::ExcludeUserInputEvents);

}

ResourceHandleInternal::~ResourceHandleInternal()

@@void ResourceHandle::loadResourceSynchronously(NetworkingContext* context, const

        d->m_firstRequest.setURL(urlWithCredentials);

    }

    d->m_context = context;

202 d->m_job = new QNetworkReplyHandler(handle.get(), QNetworkReplyHandler::LoadNormal);

    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

    syncLoader.setReplyFinished(reply->isFinished());

    d->m_job->forwardData();

    d->m_job->finish();

    syncLoader.waitForCompletion();

    error = syncLoader.resourceError();