Improve fidelity of XHR progress events.

Source/core/xml/XMLHttpRequestUpload.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 42 matching lines @@
     return m_xmlHttpRequest->executionContext();
 }
 
 void XMLHttpRequestUpload::dispatchProgressEvent(unsigned long long bytesSent, unsigned long long totalBytesToBeSent)
 {
     m_lastBytesSent = bytesSent;
     m_lastTotalBytesToBeSent = totalBytesToBeSent;
     dispatchEvent(XMLHttpRequestProgressEvent::create(EventTypeNames::progress, true, bytesSent, totalBytesToBeSent));
 }
 
-void XMLHttpRequestUpload::dispatchEventAndLoadEnd(PassRefPtr<Event> event)
+void XMLHttpRequestUpload::dispatchEventAndLoadEnd(const AtomicString& type, bool lengthComputable, unsigned long long bytesSent, unsigned long long total)
 {
-    ASSERT(event->type() == EventTypeNames::load || event->type() == EventTypeNames::abort || event->type() == EventTypeNames::error || event->type() == EventTypeNames::timeout);
+    ASSERT(type == EventTypeNames::load || type == EventTypeNames::abort || type == EventTypeNames::error || type == EventTypeNames::timeout);
 
-    dispatchEvent(event);
-    dispatchEvent(XMLHttpRequestProgressEvent::create(EventTypeNames::loadend));
+    if (!lengthComputable && !bytesSent)
+        bytesSent = m_lastBytesSent;
+
+    if (!lengthComputable && !total) {
+        total = m_lastTotalBytesToBeSent;
+        if (total >= 0 && bytesSent <= total)
+            lengthComputable = true;
+    }
+
+    dispatchEvent(XMLHttpRequestProgressEvent::create(type, lengthComputable, bytesSent, total));
+    dispatchEvent(XMLHttpRequestProgressEvent::create(EventTypeNames::loadend, lengthComputable, bytesSent, total));
 }
 
 void XMLHttpRequestUpload::handleRequestError(const AtomicString& type)
 {
     dispatchEvent(XMLHttpRequestProgressEvent::create(EventTypeNames::progress, true, m_lastBytesSent, m_lastTotalBytesToBeSent));

[tyoshino (SeeGerritForStatus), 2013/11/25 08:06:15]

looks we should have some flag indicating we've received bytesSent and
totalBytesToBeSent and switch lengthComputable accordingly.

l67-74 should be moved to this method after removing if-clauses and changed a
bit to generate values based on the flag, m_last... variables.

[sof, 2013/11/25 11:38:24]

I think it is quite reasonable to derive lengthComputable from the values
recorded for (loaded, totals), and have done so. Along with doing away with the
defaulting that dispatchEventAndLoadEnd() was engaged in.

-    dispatchEventAndLoadEnd(XMLHttpRequestProgressEvent::create(type));
+    dispatchEventAndLoadEnd(type, true, m_lastBytesSent, m_lastTotalBytesToBeSent);
 }
 
 } // namespace WebCore