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

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

Issue 23533007: Replace responseType mismatch handling code in XMLHttpRequest::responseJSONSource() with ASSERT (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 3 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
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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 void send(Blob*, ExceptionState&); 106 void send(Blob*, ExceptionState&);
107 void send(DOMFormData*, ExceptionState&); 107 void send(DOMFormData*, ExceptionState&);
108 void send(ArrayBuffer*, ExceptionState&); 108 void send(ArrayBuffer*, ExceptionState&);
109 void send(ArrayBufferView*, ExceptionState&); 109 void send(ArrayBufferView*, ExceptionState&);
110 void abort(); 110 void abort();
111 void setRequestHeader(const AtomicString& name, const String& value, Excepti onState&); 111 void setRequestHeader(const AtomicString& name, const String& value, Excepti onState&);
112 void overrideMimeType(const String& override); 112 void overrideMimeType(const String& override);
113 String getAllResponseHeaders(ExceptionState&) const; 113 String getAllResponseHeaders(ExceptionState&) const;
114 String getResponseHeader(const AtomicString& name, ExceptionState&) const; 114 String getResponseHeader(const AtomicString& name, ExceptionState&) const;
115 ScriptString responseText(ExceptionState&); 115 ScriptString responseText(ExceptionState&);
116 ScriptString responseJSONSource(ExceptionState&); 116 ScriptString responseJSONSource();
117 Document* responseXML(ExceptionState&); 117 Document* responseXML(ExceptionState&);
118 Blob* responseBlob(); 118 Blob* responseBlob();
119 unsigned long timeout() const { return m_timeoutMilliseconds; } 119 unsigned long timeout() const { return m_timeoutMilliseconds; }
120 void setTimeout(unsigned long timeout, ExceptionState&); 120 void setTimeout(unsigned long timeout, ExceptionState&);
121 121
122 void sendForInspectorXHRReplay(PassRefPtr<FormData>, ExceptionState&); 122 void sendForInspectorXHRReplay(PassRefPtr<FormData>, ExceptionState&);
123 123
124 // Expose HTTP validation methods for other untrusted requests. 124 // Expose HTTP validation methods for other untrusted requests.
125 static bool isAllowedHTTPMethod(const String&); 125 static bool isAllowedHTTPMethod(const String&);
126 static String uppercaseKnownHTTPMethod(const String&); 126 static String uppercaseKnownHTTPMethod(const String&);
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 231
232 // An enum corresponding to the allowed string values for the responseType a ttribute. 232 // An enum corresponding to the allowed string values for the responseType a ttribute.
233 ResponseTypeCode m_responseTypeCode; 233 ResponseTypeCode m_responseTypeCode;
234 Timer<XMLHttpRequest> m_protectionTimer; 234 Timer<XMLHttpRequest> m_protectionTimer;
235 RefPtr<SecurityOrigin> m_securityOrigin; 235 RefPtr<SecurityOrigin> m_securityOrigin;
236 }; 236 };
237 237
238 } // namespace WebCore 238 } // namespace WebCore
239 239
240 #endif // XMLHttpRequest_h 240 #endif // XMLHttpRequest_h
OLDNEW
« no previous file with comments | « Source/bindings/v8/custom/V8XMLHttpRequestCustom.cpp ('k') | Source/core/xml/XMLHttpRequest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698