Index: third_party/WebKit/Source/bindings/core/v8/custom/V8XMLHttpRequestCustom.cpp |
diff --git a/third_party/WebKit/Source/bindings/core/v8/custom/V8XMLHttpRequestCustom.cpp b/third_party/WebKit/Source/bindings/core/v8/custom/V8XMLHttpRequestCustom.cpp |
index 4e8dee3d101cbfcf60d257dac9f09673c53cba65..338f417c761688d5e73b88eb428500194285ffbc 100644 |
--- a/third_party/WebKit/Source/bindings/core/v8/custom/V8XMLHttpRequestCustom.cpp |
+++ b/third_party/WebKit/Source/bindings/core/v8/custom/V8XMLHttpRequestCustom.cpp |
@@ -84,13 +84,13 @@ void V8XMLHttpRequest::responseAttributeGetterCustom( |
// Catch syntax error. Swallows an exception (when thrown) as the |
// spec says. https://xhr.spec.whatwg.org/#response-body |
- v8::TryCatch exceptionCatcher(isolate); |
- v8::Local<v8::Value> json; |
- if (v8Call(v8::JSON::Parse(isolate, jsonSource.v8Value()), json, |
- exceptionCatcher)) |
- v8SetReturnValue(info, json); |
- else |
+ TrackExceptionState exceptionState; |
haraken
2016/11/03 14:01:35
Use a normal ExceptionState instead of TrackExcept
rwlbuis
2016/11/03 14:12:59
Acknowledged.
|
+ v8::Local<v8::Value> json = fromJSONString( |
+ isolate, toCoreString(jsonSource.v8Value()), exceptionState); |
+ if (exceptionState.hadException()) |
v8SetReturnValue(info, v8::Null(isolate)); |
+ else |
+ v8SetReturnValue(info, json); |
return; |
} |