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

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

Issue 21600002: Add json responseType support to XMLHttpRequest (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 7 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
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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 UNSENT = 0, 62 UNSENT = 0,
63 OPENED = 1, 63 OPENED = 1,
64 HEADERS_RECEIVED = 2, 64 HEADERS_RECEIVED = 2,
65 LOADING = 3, 65 LOADING = 3,
66 DONE = 4 66 DONE = 4
67 }; 67 };
68 68
69 enum ResponseTypeCode { 69 enum ResponseTypeCode {
70 ResponseTypeDefault, 70 ResponseTypeDefault,
71 ResponseTypeText, 71 ResponseTypeText,
72 ResponseTypeJSON,
72 ResponseTypeDocument, 73 ResponseTypeDocument,
73 ResponseTypeBlob, 74 ResponseTypeBlob,
74 ResponseTypeArrayBuffer 75 ResponseTypeArrayBuffer
75 }; 76 };
76 77
77 virtual void contextDestroyed(); 78 virtual void contextDestroyed();
78 virtual void didTimeout(); 79 virtual void didTimeout();
79 virtual bool canSuspend() const; 80 virtual bool canSuspend() const;
80 virtual void suspend(ReasonForSuspension); 81 virtual void suspend(ReasonForSuspension);
81 virtual void resume(); 82 virtual void resume();
(...skipping 18 matching lines...) Expand all
100 void send(Blob*, ExceptionState&); 101 void send(Blob*, ExceptionState&);
101 void send(DOMFormData*, ExceptionState&); 102 void send(DOMFormData*, ExceptionState&);
102 void send(ArrayBuffer*, ExceptionState&); 103 void send(ArrayBuffer*, ExceptionState&);
103 void send(ArrayBufferView*, ExceptionState&); 104 void send(ArrayBufferView*, ExceptionState&);
104 void abort(); 105 void abort();
105 void setRequestHeader(const AtomicString& name, const String& value, Excepti onState&); 106 void setRequestHeader(const AtomicString& name, const String& value, Excepti onState&);
106 void overrideMimeType(const String& override); 107 void overrideMimeType(const String& override);
107 String getAllResponseHeaders(ExceptionState&) const; 108 String getAllResponseHeaders(ExceptionState&) const;
108 String getResponseHeader(const AtomicString& name, ExceptionState&) const; 109 String getResponseHeader(const AtomicString& name, ExceptionState&) const;
109 ScriptString responseText(ExceptionState&); 110 ScriptString responseText(ExceptionState&);
111 ScriptString responseJSONSource(ExceptionState&);
110 Document* responseXML(ExceptionState&); 112 Document* responseXML(ExceptionState&);
111 Blob* responseBlob(); 113 Blob* responseBlob();
112 unsigned long timeout() const { return m_timeoutMilliseconds; } 114 unsigned long timeout() const { return m_timeoutMilliseconds; }
113 void setTimeout(unsigned long timeout, ExceptionState&); 115 void setTimeout(unsigned long timeout, ExceptionState&);
114 116
115 void sendForInspectorXHRReplay(PassRefPtr<FormData>, ExceptionState&); 117 void sendForInspectorXHRReplay(PassRefPtr<FormData>, ExceptionState&);
116 118
117 // Expose HTTP validation methods for other untrusted requests. 119 // Expose HTTP validation methods for other untrusted requests.
118 static bool isAllowedHTTPMethod(const String&); 120 static bool isAllowedHTTPMethod(const String&);
119 static String uppercaseKnownHTTPMethod(const String&); 121 static String uppercaseKnownHTTPMethod(const String&);
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 226
225 // An enum corresponding to the allowed string values for the responseType a ttribute. 227 // An enum corresponding to the allowed string values for the responseType a ttribute.
226 ResponseTypeCode m_responseTypeCode; 228 ResponseTypeCode m_responseTypeCode;
227 Timer<XMLHttpRequest> m_protectionTimer; 229 Timer<XMLHttpRequest> m_protectionTimer;
228 RefPtr<SecurityOrigin> m_securityOrigin; 230 RefPtr<SecurityOrigin> m_securityOrigin;
229 }; 231 };
230 232
231 } // namespace WebCore 233 } // namespace WebCore
232 234
233 #endif // XMLHttpRequest_h 235 #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