Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(650)

Side by Side Diff: Source/core/xml/XMLHttpRequest.cpp

Issue 63033008: Move delivery of upload 'progress' events to XMLHttpRequestUpload. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | Source/core/xml/XMLHttpRequestUpload.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2005-2007 Alexey Proskuryakov <ap@webkit.org> 3 * Copyright (C) 2005-2007 Alexey Proskuryakov <ap@webkit.org>
4 * Copyright (C) 2007, 2008 Julien Chaffraix <jchaffraix@webkit.org> 4 * Copyright (C) 2007, 2008 Julien Chaffraix <jchaffraix@webkit.org>
5 * Copyright (C) 2008, 2011 Google Inc. All rights reserved. 5 * Copyright (C) 2008, 2011 Google Inc. All rights reserved.
6 * Copyright (C) 2012 Intel Corporation 6 * Copyright (C) 2012 Intel Corporation
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1205 matching lines...) Expand 10 before | Expand all | Expand 10 after
1216 } 1216 }
1217 1217
1218 void XMLHttpRequest::didSendData(unsigned long long bytesSent, unsigned long lon g totalBytesToBeSent) 1218 void XMLHttpRequest::didSendData(unsigned long long bytesSent, unsigned long lon g totalBytesToBeSent)
1219 { 1219 {
1220 LOG(Network, "XMLHttpRequest %p didSendData(%llu, %llu)", this, bytesSent, t otalBytesToBeSent); 1220 LOG(Network, "XMLHttpRequest %p didSendData(%llu, %llu)", this, bytesSent, t otalBytesToBeSent);
1221 1221
1222 if (!m_upload) 1222 if (!m_upload)
1223 return; 1223 return;
1224 1224
1225 if (m_uploadEventsAllowed) 1225 if (m_uploadEventsAllowed)
1226 m_upload->dispatchEvent(XMLHttpRequestProgressEvent::create(EventTypeNam es::progress, true, bytesSent, totalBytesToBeSent)); 1226 m_upload->dispatchProgressEvent(bytesSent, totalBytesToBeSent);
1227 1227
1228 if (bytesSent == totalBytesToBeSent && !m_uploadComplete) { 1228 if (bytesSent == totalBytesToBeSent && !m_uploadComplete) {
1229 m_uploadComplete = true; 1229 m_uploadComplete = true;
1230 if (m_uploadEventsAllowed) 1230 if (m_uploadEventsAllowed)
1231 m_upload->dispatchEventAndLoadEnd(XMLHttpRequestProgressEvent::creat e(EventTypeNames::load)); 1231 m_upload->dispatchEventAndLoadEnd(XMLHttpRequestProgressEvent::creat e(EventTypeNames::load));
1232 } 1232 }
1233 } 1233 }
1234 1234
1235 void XMLHttpRequest::didReceiveResponse(unsigned long identifier, const Resource Response& response) 1235 void XMLHttpRequest::didReceiveResponse(unsigned long identifier, const Resource Response& response)
1236 { 1236 {
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
1366 { 1366 {
1367 return EventTargetNames::XMLHttpRequest; 1367 return EventTargetNames::XMLHttpRequest;
1368 } 1368 }
1369 1369
1370 ExecutionContext* XMLHttpRequest::executionContext() const 1370 ExecutionContext* XMLHttpRequest::executionContext() const
1371 { 1371 {
1372 return ActiveDOMObject::executionContext(); 1372 return ActiveDOMObject::executionContext();
1373 } 1373 }
1374 1374
1375 } // namespace WebCore 1375 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/xml/XMLHttpRequestUpload.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698