Move fromJSONString to V8Binding

third_party/WebKit/Source/bindings/core/v8/custom/V8XMLHttpRequestCustom.cpp

 /*
  * Copyright (C) 2008, 2009, 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 48 matching lines @@
   if (text.isEmpty()) {
     v8SetReturnValueString(info, emptyString(), info.GetIsolate());
     return;
   }
   v8SetReturnValue(info, text.v8Value());
 }
 
 void V8XMLHttpRequest::responseAttributeGetterCustom(
     const v8::FunctionCallbackInfo<v8::Value>& info) {
   XMLHttpRequest* xmlHttpRequest = V8XMLHttpRequest::toImpl(info.Holder());
+  ExceptionState exceptionState(ExceptionState::GetterContext, "response",
+                                "XMLHttpRequest", info.Holder(),
+                                info.GetIsolate());
 
   switch (xmlHttpRequest->getResponseTypeCode()) {
     case XMLHttpRequest::ResponseTypeDefault:
     case XMLHttpRequest::ResponseTypeText:
       responseTextAttributeGetterCustom(info);
       return;
 
     case XMLHttpRequest::ResponseTypeJSON: {
       v8::Isolate* isolate = info.GetIsolate();
 
       ScriptString jsonSource = xmlHttpRequest->responseJSONSource();
       if (jsonSource.isEmpty()) {
         v8SetReturnValue(info, v8::Null(isolate));
         return;
       }
 
       // 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))
+      v8::Local<v8::Value> json = fromJSONString(
+          isolate, toCoreString(jsonSource.v8Value()), exceptionState);
+      if (exceptionState.hadException()) {
+        exceptionState.clearException();
+        v8SetReturnValue(info, v8::Null(isolate));
+      } else {
         v8SetReturnValue(info, json);
-      else
-        v8SetReturnValue(info, v8::Null(isolate));
+      }
       return;
     }
 
     case XMLHttpRequest::ResponseTypeDocument: {
-      ExceptionState exceptionState(ExceptionState::GetterContext, "response",
-                                    "XMLHttpRequest", info.Holder(),
-                                    info.GetIsolate());
       Document* document = xmlHttpRequest->responseXML(exceptionState);
       v8SetReturnValueFast(info, document, xmlHttpRequest);
       return;
     }
 
     case XMLHttpRequest::ResponseTypeBlob: {
       Blob* blob = xmlHttpRequest->responseBlob();
       v8SetReturnValueFast(info, blob, xmlHttpRequest);
       return;
     }
 
     case XMLHttpRequest::ResponseTypeLegacyStream: {
       Stream* stream = xmlHttpRequest->responseLegacyStream();
       v8SetReturnValueFast(info, stream, xmlHttpRequest);
       return;
     }
 
     case XMLHttpRequest::ResponseTypeArrayBuffer: {
       DOMArrayBuffer* arrayBuffer = xmlHttpRequest->responseArrayBuffer();
       v8SetReturnValueFast(info, arrayBuffer, xmlHttpRequest);
       return;
     }
   }
 }
 
 }  // namespace blink