OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
53 return m_xmlHttpRequest->executionContext(); | 53 return m_xmlHttpRequest->executionContext(); |
54 } | 54 } |
55 | 55 |
56 void XMLHttpRequestUpload::dispatchProgressEvent(unsigned long long bytesSent, u nsigned long long totalBytesToBeSent) | 56 void XMLHttpRequestUpload::dispatchProgressEvent(unsigned long long bytesSent, u nsigned long long totalBytesToBeSent) |
57 { | 57 { |
58 m_lastBytesSent = bytesSent; | 58 m_lastBytesSent = bytesSent; |
59 m_lastTotalBytesToBeSent = totalBytesToBeSent; | 59 m_lastTotalBytesToBeSent = totalBytesToBeSent; |
60 dispatchEvent(XMLHttpRequestProgressEvent::create(EventTypeNames::progress, true, bytesSent, totalBytesToBeSent)); | 60 dispatchEvent(XMLHttpRequestProgressEvent::create(EventTypeNames::progress, true, bytesSent, totalBytesToBeSent)); |
61 } | 61 } |
62 | 62 |
63 void XMLHttpRequestUpload::dispatchEventAndLoadEnd(PassRefPtr<Event> event) | 63 void XMLHttpRequestUpload::dispatchEventAndLoadEnd(const AtomicString& type, boo l lengthComputable, unsigned long long bytesSent, unsigned long long total) |
64 { | 64 { |
65 ASSERT(event->type() == EventTypeNames::load || event->type() == EventTypeNa mes::abort || event->type() == EventTypeNames::error || event->type() == EventTy peNames::timeout); | 65 ASSERT(type == EventTypeNames::load || type == EventTypeNames::abort || type == EventTypeNames::error || type == EventTypeNames::timeout); |
66 | 66 dispatchEvent(XMLHttpRequestProgressEvent::create(type, lengthComputable, by tesSent, total)); |
67 dispatchEvent(event); | 67 dispatchEvent(XMLHttpRequestProgressEvent::create(EventTypeNames::loadend, l engthComputable, bytesSent, total)); |
68 dispatchEvent(XMLHttpRequestProgressEvent::create(EventTypeNames::loadend)); | |
69 } | 68 } |
70 | 69 |
71 void XMLHttpRequestUpload::handleRequestError(const AtomicString& type) | 70 void XMLHttpRequestUpload::handleRequestError(const AtomicString& type) |
72 { | 71 { |
73 dispatchEvent(XMLHttpRequestProgressEvent::create(EventTypeNames::progress, true, m_lastBytesSent, m_lastTotalBytesToBeSent)); | 72 bool lengthComputable = m_lastTotalBytesToBeSent > 0 && m_lastBytesSent <= m _lastTotalBytesToBeSent; |
tyoshino (SeeGerritForStatus)
2013/11/25 12:35:33
yeah. it's fine to determine lengthComputable from
sof
2013/11/25 13:30:38
Does that matter, practically? if we haven't gotte
tyoshino (SeeGerritForStatus)
2013/11/25 13:39:14
Ah,... right. And, if dispatchEventAndLoadEnd is c
| |
74 dispatchEventAndLoadEnd(XMLHttpRequestProgressEvent::create(type)); | 73 dispatchEvent(XMLHttpRequestProgressEvent::create(EventTypeNames::progress, lengthComputable, m_lastBytesSent, m_lastTotalBytesToBeSent)); |
74 dispatchEventAndLoadEnd(type, true, m_lastBytesSent, m_lastTotalBytesToBeSen t); | |
tyoshino (SeeGerritForStatus)
2013/11/25 12:35:33
true -> lengthComputable?
sof
2013/11/25 15:28:18
Done.
| |
75 } | 75 } |
76 | 76 |
77 } // namespace WebCore | 77 } // namespace WebCore |
OLD | NEW |