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

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

Issue 490083002: [XHR] Move the code to clear variables to internalAbort() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Reverted removal of cancelLoader() in handleDidTimeout Created 6 years, 4 months 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/xml/XMLHttpRequest.cpp » ('j') | Source/core/xml/XMLHttpRequest.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003, 2006, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2006, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2005, 2006 Alexey Proskuryakov <ap@nypop.com> 3 * Copyright (C) 2005, 2006 Alexey Proskuryakov <ap@nypop.com>
4 * Copyright (C) 2011 Google Inc. All rights reserved. 4 * Copyright (C) 2011 Google Inc. All rights reserved.
5 * Copyright (C) 2012 Intel Corporation 5 * Copyright (C) 2012 Intel Corporation
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Lesser General Public 8 * modify it under the terms of the GNU Lesser General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 void setRequestHeaderInternal(const AtomicString& name, const AtomicString& value); 194 void setRequestHeaderInternal(const AtomicString& name, const AtomicString& value);
195 195
196 void trackProgress(int dataLength); 196 void trackProgress(int dataLength);
197 // Changes m_state and dispatches a readyStateChange event if new m_state 197 // Changes m_state and dispatches a readyStateChange event if new m_state
198 // value is different from last one. 198 // value is different from last one.
199 void changeState(State newState); 199 void changeState(State newState);
200 void dispatchReadyStateChangeEvent(); 200 void dispatchReadyStateChangeEvent();
201 201
202 // Clears variables used only while the resource is being loaded. 202 // Clears variables used only while the resource is being loaded.
203 void clearVariablesForLoading(); 203 void clearVariablesForLoading();
204 // Returns false iff reentry happened and a new load is started. 204 void internalAbort();
205 bool internalAbort(); 205 // Detaches m_loader and calls cancel() on it. Returns false iff reentry
206 // happened and a new load is started.
207 bool cancelLoader();
206 // Clears variables holding response header and body data. 208 // Clears variables holding response header and body data.
207 void clearResponse(); 209 void clearResponse();
208 void clearRequest(); 210 void clearRequest();
209 211
210 void createRequest(PassRefPtr<FormData>, ExceptionState&); 212 void createRequest(PassRefPtr<FormData>, ExceptionState&);
211 213
212 // Dispatches a response ProgressEvent. 214 // Dispatches a response ProgressEvent.
213 void dispatchProgressEvent(const AtomicString&, long long, long long); 215 void dispatchProgressEvent(const AtomicString&, long long, long long);
214 // Dispatches a response ProgressEvent using values sampled from 216 // Dispatches a response ProgressEvent using values sampled from
215 // m_receivedLength and m_response. 217 // m_receivedLength and m_response.
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 bool m_parsedResponse; 284 bool m_parsedResponse;
283 bool m_error; 285 bool m_error;
284 bool m_uploadEventsAllowed; 286 bool m_uploadEventsAllowed;
285 bool m_uploadComplete; 287 bool m_uploadComplete;
286 bool m_sameOriginRequest; 288 bool m_sameOriginRequest;
287 }; 289 };
288 290
289 } // namespace blink 291 } // namespace blink
290 292
291 #endif // XMLHttpRequest_h 293 #endif // XMLHttpRequest_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/xml/XMLHttpRequest.cpp » ('j') | Source/core/xml/XMLHttpRequest.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698