Changeset 72736 in webkit


Ignore:
Timestamp:
Nov 25, 2010 9:50:16 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2010-11-25 Sheriff Bot <webkit.review.bot@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):
Location:
trunk/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r72735 r72736  
     12010-11-25  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r72732.
     4        http://trac.webkit.org/changeset/72732
     5        https://bugs.webkit.org/show_bug.cgi?id=50089
     6
     7        Made Qt bot sad and crashy (Requested by Ossy on #webkit).
     8
     9        * platform/network/qt/QNetworkReplyHandler.cpp:
     10        (WebCore::QNetworkReplyHandler::QNetworkReplyHandler):
     11        * platform/network/qt/QNetworkReplyHandler.h:
     12        * platform/network/qt/ResourceHandleQt.cpp:
     13        (WebCore::WebCoreSynchronousLoader::didFinishLoading):
     14        (WebCore::WebCoreSynchronousLoader::didFail):
     15        (WebCore::ResourceHandle::loadResourceSynchronously):
     16
    1172010-11-25  Sheriff Bot  <webkit.review.bot@gmail.com>
    218
  • trunk/WebCore/platform/network/qt/QNetworkReplyHandler.cpp

    r72732 r72736  
    5151#define SIGNAL_CONN Qt::QueuedConnection
    5252#endif
    53 
    54 // In Qt 4.8, the attribute for sending a request synchronously will be made public,
    55 // for now, use this hackish solution for setting the internal attribute.
    56 const QNetworkRequest::Attribute gSynchronousNetworkRequestAttribute = static_cast<QNetworkRequest::Attribute>(QNetworkRequest::HttpPipeliningWasUsedAttribute + 7);
    5753
    5854static const int gMaxRecursionLimit = 10;
     
    223219    m_request = r.toNetworkRequest(originatingObject);
    224220
    225     if (m_loadMode == LoadSynchronously) {
    226         m_request.setAttribute(gSynchronousNetworkRequestAttribute, true);
    227         m_loadMode = LoadNormal;
    228     }
    229 
    230221    if (m_loadMode == LoadNormal)
    231222        start();
  • trunk/WebCore/platform/network/qt/QNetworkReplyHandler.h

    r72732 r72736  
    4343        LoadNormal,
    4444        LoadDeferred,
    45         LoadResuming,
    46         LoadSynchronously
     45        LoadResuming
    4746    };
    4847
     
    5958    void processQueuedItems();
    6059
    61 public slots:
     60private slots:
    6261    void finish();
    6362    void sendResponseIfNeeded();
  • trunk/WebCore/platform/network/qt/ResourceHandleQt.cpp

    r72735 r72736  
    7070    Vector<char> data() const { return m_data; }
    7171
    72     void setReplyFinished(bool finished) { m_replyFinished = finished; }
    73 
    7472private:
    7573    ResourceResponse m_response;
     
    7775    Vector<char> m_data;
    7876    QEventLoop m_eventLoop;
    79     bool m_replyFinished;
    8077};
    8178
    8279WebCoreSynchronousLoader::WebCoreSynchronousLoader()
    83         : m_replyFinished(false)
    8480{
    8581}
     
    9793void WebCoreSynchronousLoader::didFinishLoading(ResourceHandle*, double)
    9894{
    99     if (!m_replyFinished)
    100         m_eventLoop.exit();
     95    m_eventLoop.exit();
    10196}
    10297
     
    10499{
    105100    m_error = error;
    106     if (!m_replyFinished)
    107         m_eventLoop.exit();
     101    m_eventLoop.exit();
    108102}
    109103
     
    208202    }
    209203    d->m_context = context;
    210     d->m_job = new QNetworkReplyHandler(handle.get(), QNetworkReplyHandler::LoadSynchronously);
    211 
    212     QNetworkReply* reply = d->m_job->reply();
    213     // When using synchronous calls, we are finished when reaching this point.
    214     if (reply->isFinished()) {
    215         syncLoader.setReplyFinished(true);
    216         d->m_job->forwardData();
    217         d->m_job->finish();
    218     } else {
    219         syncLoader.waitForCompletion();
    220     }
     204    d->m_job = new QNetworkReplyHandler(handle.get(), QNetworkReplyHandler::LoadNormal);
     205
     206    syncLoader.waitForCompletion();
    221207    error = syncLoader.resourceError();
    222208    data = syncLoader.data();
Note: See TracChangeset for help on using the changeset viewer.