| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008, 2009, 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2008, 2009, 2010 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 #include "core/dom/Document.h" | 45 #include "core/dom/Document.h" |
| 46 #include "core/inspector/InspectorInstrumentation.h" | 46 #include "core/inspector/InspectorInstrumentation.h" |
| 47 #include "core/streams/ReadableStream.h" | 47 #include "core/streams/ReadableStream.h" |
| 48 #include "core/streams/Stream.h" | 48 #include "core/streams/Stream.h" |
| 49 #include "core/workers/WorkerGlobalScope.h" | 49 #include "core/workers/WorkerGlobalScope.h" |
| 50 #include "core/xmlhttprequest/XMLHttpRequest.h" | 50 #include "core/xmlhttprequest/XMLHttpRequest.h" |
| 51 #include <v8.h> | 51 #include <v8.h> |
| 52 | 52 |
| 53 namespace blink { | 53 namespace blink { |
| 54 | 54 |
| 55 void V8XMLHttpRequest::responseTextAttributeGetterCustom(const v8::PropertyCallb
ackInfo<v8::Value>& info) | 55 void V8XMLHttpRequest::responseTextAttributeGetterCustom(const v8::FunctionCallb
ackInfo<v8::Value>& info) |
| 56 { | 56 { |
| 57 XMLHttpRequest* xmlHttpRequest = V8XMLHttpRequest::toImpl(info.Holder()); | 57 XMLHttpRequest* xmlHttpRequest = V8XMLHttpRequest::toImpl(info.Holder()); |
| 58 ExceptionState exceptionState(ExceptionState::GetterContext, "responseText",
"XMLHttpRequest", info.Holder(), info.GetIsolate()); | 58 ExceptionState exceptionState(ExceptionState::GetterContext, "responseText",
"XMLHttpRequest", info.Holder(), info.GetIsolate()); |
| 59 ScriptString text = xmlHttpRequest->responseText(exceptionState); | 59 ScriptString text = xmlHttpRequest->responseText(exceptionState); |
| 60 if (exceptionState.throwIfNeeded()) | 60 if (exceptionState.throwIfNeeded()) |
| 61 return; | 61 return; |
| 62 if (text.isEmpty()) { | 62 if (text.isEmpty()) { |
| 63 v8SetReturnValueString(info, emptyString(), info.GetIsolate()); | 63 v8SetReturnValueString(info, emptyString(), info.GetIsolate()); |
| 64 return; | 64 return; |
| 65 } | 65 } |
| 66 v8SetReturnValue(info, text.v8Value()); | 66 v8SetReturnValue(info, text.v8Value()); |
| 67 } | 67 } |
| 68 | 68 |
| 69 void V8XMLHttpRequest::responseAttributeGetterCustom(const v8::PropertyCallbackI
nfo<v8::Value>& info) | 69 void V8XMLHttpRequest::responseAttributeGetterCustom(const v8::FunctionCallbackI
nfo<v8::Value>& info) |
| 70 { | 70 { |
| 71 XMLHttpRequest* xmlHttpRequest = V8XMLHttpRequest::toImpl(info.Holder()); | 71 XMLHttpRequest* xmlHttpRequest = V8XMLHttpRequest::toImpl(info.Holder()); |
| 72 | 72 |
| 73 switch (xmlHttpRequest->responseTypeCode()) { | 73 switch (xmlHttpRequest->responseTypeCode()) { |
| 74 case XMLHttpRequest::ResponseTypeDefault: | 74 case XMLHttpRequest::ResponseTypeDefault: |
| 75 case XMLHttpRequest::ResponseTypeText: | 75 case XMLHttpRequest::ResponseTypeText: |
| 76 responseTextAttributeGetterCustom(info); | 76 responseTextAttributeGetterCustom(info); |
| 77 return; | 77 return; |
| 78 | 78 |
| 79 case XMLHttpRequest::ResponseTypeJSON: | 79 case XMLHttpRequest::ResponseTypeJSON: |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 case XMLHttpRequest::ResponseTypeArrayBuffer: | 131 case XMLHttpRequest::ResponseTypeArrayBuffer: |
| 132 { | 132 { |
| 133 DOMArrayBuffer* arrayBuffer = xmlHttpRequest->responseArrayBuffer(); | 133 DOMArrayBuffer* arrayBuffer = xmlHttpRequest->responseArrayBuffer(); |
| 134 v8SetReturnValueFast(info, arrayBuffer, xmlHttpRequest); | 134 v8SetReturnValueFast(info, arrayBuffer, xmlHttpRequest); |
| 135 return; | 135 return; |
| 136 } | 136 } |
| 137 } | 137 } |
| 138 } | 138 } |
| 139 | 139 |
| 140 } // namespace blink | 140 } // namespace blink |
| OLD | NEW |