Changeset 129692 in webkit

Timestamp:

Sep 26, 2012 1:10:16 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] load event fires on XMLHttpRequestUpload twice with Qt5
​https://bugs.webkit.org/show_bug.cgi?id=92669

Patch by Marcelo Lira <​marcelo.lira@openbossa.org> on 2012-09-26
Reviewed by Kenneth Rohde Christiansen.

When finishing, after the upload have already been done, Qt5's
QNetworkReply emits an uploadProgress signal with total bytes set to
zero. Since 0 of 0 bytes doesn't make any sense as progress, a
conditional was added to QNetworkReplyHandler::uploadProgress to make
do nothing with such values.

Unskip XMLHttpRequestUpload tests.

Source/WebCore:

• platform/network/qt/QNetworkReplyHandler.cpp:

(WebCore::QNetworkReplyHandler::uploadProgress):

LayoutTests:

• platform/qt-5.0/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt-5.0/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-26  Marcelo Lira  <marcelo.lira@openbossa.org>
+
+        [Qt] load event fires on XMLHttpRequestUpload twice with Qt5
+        https://bugs.webkit.org/show_bug.cgi?id=92669
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        When finishing, after the upload have already been done, Qt5's
+        QNetworkReply emits an uploadProgress signal with total bytes set to
+        zero. Since 0 of 0 bytes doesn't make any sense as progress, a
+        conditional was added to QNetworkReplyHandler::uploadProgress to make
+        do nothing with such values.
+
+        Unskip XMLHttpRequestUpload tests.
+
+        * platform/qt-5.0/Skipped:
+
 2012-09-26  Filip Pizlo  <fpizlo@apple.com>
 

trunk/LayoutTests/platform/qt-5.0/Skipped

@@ -1 @@
-# [Qt] load event fires on XMLHttpRequestUpload twice with Qt5
-# https://bugs.webkit.org/show_bug.cgi?id=92669
-http/tests/xmlhttprequest/upload-onprogress-event.html
-http/tests/xmlhttprequest/upload-progress-events.html
-
 # timeout
 fast/events/bogus-dropEffect-effectAllowed.html

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-26  Marcelo Lira  <marcelo.lira@openbossa.org>
+
+        [Qt] load event fires on XMLHttpRequestUpload twice with Qt5
+        https://bugs.webkit.org/show_bug.cgi?id=92669
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        When finishing, after the upload have already been done, Qt5's
+        QNetworkReply emits an uploadProgress signal with total bytes set to
+        zero. Since 0 of 0 bytes doesn't make any sense as progress, a
+        conditional was added to QNetworkReplyHandler::uploadProgress to make
+        do nothing with such values.
+
+        Unskip XMLHttpRequestUpload tests.
+
+        * platform/network/qt/QNetworkReplyHandler.cpp:
+        (WebCore::QNetworkReplyHandler::uploadProgress):
+
 2012-09-26  Bear Travis  <betravis@adobe.com>
 

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

@@ -582 +582 @@
     if (!client)
         return;
+
+    if (!bytesTotal) {
+        // When finished QNetworkReply emits a progress of 0 bytes.
+        // Ignore that, to avoid firing twice.
+        return;
+    }
 
     client->didSendData(m_resourceHandle, bytesSent, bytesTotal);