Changeset 52590 in webkit


Ignore:
Timestamp:
Dec 27, 2009, 7:39:02 PM (16 years ago)
Author:
eric@webkit.org
Message:

2009-12-27 Jakub Wieczorek <​faw217@gmail.com>

Reviewed by Eric Seidel.

[Qt] Support upload progress events in XMLHttpRequest
​https://bugs.webkit.org/show_bug.cgi?id=32969

Make QNetworkReplyHandler report the upload progress to the client.

Already covered by tests:
http/tests/xmlhttprequest/upload-onload-event.html
http/tests/xmlhttprequest/upload-onloadstart-event.html
http/tests/xmlhttprequest/upload-progress-events.html
http/tests/xmlhttprequest/upload-onprogress-event.html

which have been unskipped.

  • platform/network/qt/QNetworkReplyHandler.cpp: (WebCore::QNetworkReplyHandler::uploadProgress): (WebCore::QNetworkReplyHandler::start):
  • platform/network/qt/QNetworkReplyHandler.h:

2009-12-27 Jakub Wieczorek <​faw217@gmail.com>

Reviewed by Eric Seidel.

[Qt] Support upload progress events in XMLHttpRequest
​https://bugs.webkit.org/show_bug.cgi?id=32969

Make QNetworkReplyHandler report the upload progress to the client.

Already covered by tests:
http/tests/xmlhttprequest/upload-onload-event.html
http/tests/xmlhttprequest/upload-onloadstart-event.html
http/tests/xmlhttprequest/upload-progress-events.html
http/tests/xmlhttprequest/upload-onprogress-event.html

which have been unskipped.

  • platform/qt/Skipped:
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r52589 r52590  
     12009-12-27  Jakub Wieczorek  <faw217@gmail.com>
     2
     3        Reviewed by Eric Seidel.
     4
     5        [Qt] Support upload progress events in XMLHttpRequest
     6        https://bugs.webkit.org/show_bug.cgi?id=32969
     7
     8        Make QNetworkReplyHandler report the upload progress to the client.
     9
     10        Already covered by tests:
     11        http/tests/xmlhttprequest/upload-onload-event.html
     12        http/tests/xmlhttprequest/upload-onloadstart-event.html
     13        http/tests/xmlhttprequest/upload-progress-events.html
     14        http/tests/xmlhttprequest/upload-onprogress-event.html
     15
     16        which have been unskipped.
     17
     18        * platform/qt/Skipped:
     19
    1202009-12-27  Maciej Stachowiak  <mjs@apple.com>
    221

  • trunk/LayoutTests/platform/qt/Skipped

    r52578 r52590  
    49994999http/tests/xmlhttprequest/redirect-cross-origin-tripmine.html
    50005000http/tests/xmlhttprequest/state-after-network-error.html
    5001 http/tests/xmlhttprequest/upload-onload-event.html
    5002 http/tests/xmlhttprequest/upload-onprogress-event.html
    5003 http/tests/xmlhttprequest/upload-progress-events.html
    50045001http/tests/xmlhttprequest/workers/methods-async.html
    50055002http/tests/xmlhttprequest/workers/methods.html

  • trunk/WebCore/ChangeLog

    r52584 r52590  
     12009-12-27  Jakub Wieczorek  <faw217@gmail.com>
     2
     3        Reviewed by Eric Seidel.
     4
     5        [Qt] Support upload progress events in XMLHttpRequest
     6        https://bugs.webkit.org/show_bug.cgi?id=32969
     7
     8        Make QNetworkReplyHandler report the upload progress to the client.
     9
     10        Already covered by tests:
     11        http/tests/xmlhttprequest/upload-onload-event.html
     12        http/tests/xmlhttprequest/upload-onloadstart-event.html
     13        http/tests/xmlhttprequest/upload-progress-events.html
     14        http/tests/xmlhttprequest/upload-onprogress-event.html
     15
     16        which have been unskipped.
     17
     18        * platform/network/qt/QNetworkReplyHandler.cpp:
     19        (WebCore::QNetworkReplyHandler::uploadProgress):
     20        (WebCore::QNetworkReplyHandler::start):
     21        * platform/network/qt/QNetworkReplyHandler.h:
     22
    1232009-12-27  Dirk Schulze  <krit@webkit.org>
    224

  • trunk/WebCore/platform/network/qt/QNetworkReplyHandler.cpp

    r52153 r52590  
    384384}
    385385
     386void QNetworkReplyHandler::uploadProgress(qint64 bytesSent, qint64 bytesTotal)
     387{
     388    if (!m_resourceHandle)
     389        return;
     390
     391    ResourceHandleClient* client = m_resourceHandle->client();
     392    if (!client)
     393        return;
     394
     395    client->didSendData(m_resourceHandle, bytesSent, bytesTotal);
     396}
     397
    386398void QNetworkReplyHandler::start()
    387399{
    … …  
    453465            this, SLOT(forwardData()), SIGNAL_CONN);
    454466
     467    if (m_resourceHandle->request().reportUploadProgress()) {
     468        connect(m_reply, SIGNAL(uploadProgress(qint64, qint64)),
     469                this, SLOT(uploadProgress(qint64, qint64)), SIGNAL_CONN);
     470    }
     471
    455472    // Make this a direct function call once we require 4.6.1+.
    456473    connect(this, SIGNAL(processQueuedItems()),

  • trunk/WebCore/platform/network/qt/QNetworkReplyHandler.h

    r51174 r52590  
    6363    void forwardData();
    6464    void sendQueuedItems();
     65    void uploadProgress(qint64 bytesSent, qint64 bytesTotal);
    6566
    6667private:
Note: See TracChangeset for help on using the changeset viewer.