| OLD | NEW |
| 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 860 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 871 m_uploadComplete = true; | 871 m_uploadComplete = true; |
| 872 if (m_upload && m_uploadEventsAllowed) | 872 if (m_upload && m_uploadEventsAllowed) |
| 873 m_upload->dispatchEventAndLoadEnd(XMLHttpRequestProgressEvent::creat
e(EventTypeNames::abort)); | 873 m_upload->dispatchEventAndLoadEnd(XMLHttpRequestProgressEvent::creat
e(EventTypeNames::abort)); |
| 874 } | 874 } |
| 875 } | 875 } |
| 876 | 876 |
| 877 void XMLHttpRequest::clearVariablesForLoading() | 877 void XMLHttpRequest::clearVariablesForLoading() |
| 878 { | 878 { |
| 879 // FIXME: when we add the support for multi-part XHR, we will have to think
be careful with this initialization. | 879 // FIXME: when we add the support for multi-part XHR, we will have to think
be careful with this initialization. |
| 880 m_receivedLength = 0; | 880 m_receivedLength = 0; |
| 881 m_decoder = 0; | 881 m_decoder.clear(); |
| 882 | 882 |
| 883 m_responseEncoding = String(); | 883 m_responseEncoding = String(); |
| 884 } | 884 } |
| 885 | 885 |
| 886 bool XMLHttpRequest::internalAbort(DropProtection async) | 886 bool XMLHttpRequest::internalAbort(DropProtection async) |
| 887 { | 887 { |
| 888 m_error = true; | 888 m_error = true; |
| 889 | 889 |
| 890 clearVariablesForLoading(); | 890 clearVariablesForLoading(); |
| 891 | 891 |
| (...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 |
| OLD | NEW |