Add json responseType support to XMLHttpRequest

Source/bindings/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 29 matching lines @@
 #include "bindings/v8/V8Binding.h"
 #include "bindings/v8/V8Utilities.h"
 #include "bindings/v8/custom/V8ArrayBufferCustom.h"
 #include "core/dom/Document.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/page/Frame.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/xml/XMLHttpRequest.h"
 #include "wtf/ArrayBuffer.h"
 
+#include <v8.h>
+
 namespace WebCore {
 
 void V8XMLHttpRequest::constructorCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     ScriptExecutionContext* context = getScriptExecutionContext();
 
     RefPtr<SecurityOrigin> securityOrigin;
     if (context->isDocument()) {
         if (DOMWrapperWorld* world = isolatedWorldForEnteredContext())
             securityOrigin = world->isolatedWorldSecurityOrigin();
@@ skipping 23 matching lines @@
 void V8XMLHttpRequest::responseAttrGetterCustom(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
 {
     XMLHttpRequest* xmlHttpRequest = V8XMLHttpRequest::toNative(info.Holder());
 
     switch (xmlHttpRequest->responseTypeCode()) {
     case XMLHttpRequest::ResponseTypeDefault:
     case XMLHttpRequest::ResponseTypeText:
         responseTextAttrGetterCustom(name, info);
         return;
 
+    case XMLHttpRequest::ResponseTypeJson:

[abarth-chromium, 2013/08/06 19:28:33]

ResponseTypeJson -> ResponseTypeJSON

[tyoshino (SeeGerritForStatus), 2013/08/07 03:37:46]

Done.

+        {
+            ExceptionState es(info.GetIsolate());
+            ScriptString jsonSource = xmlHttpRequest->responseJsonSource(es);

[abarth-chromium, 2013/08/06 19:28:33]

responseJsonSource -> responseJSONSource

[tyoshino (SeeGerritForStatus), 2013/08/07 03:37:46]

Done.

+            if (es.throwIfNeeded())
+                return;
+
+            v8::Isolate* isolate = info.GetIsolate();

[abarth-chromium, 2013/08/06 19:28:33]

Should we grab the isolate at the top of the block instead of calling GetIsolate
twice?

[tyoshino (SeeGerritForStatus), 2013/08/07 03:37:46]

Yes! Done

+
+            if (jsonSource.hasNoValue() || !jsonSource.v8Value()->IsString()) {
+                v8SetReturnValue(info, v8NullWithCheck(isolate));
+                return;
+            }
+
+            // Catch syntax error.
+            v8::TryCatch exceptionCatcher;
+
+            v8::Handle<v8::Value> json = v8::JSON::Parse(jsonSource.v8Value().As<v8::String>());
+
+            if (exceptionCatcher.HasCaught() || json.IsEmpty())
+                v8SetReturnValue(info, v8NullWithCheck(isolate));
+            else
+                v8SetReturnValue(info, json);
+
+            return;
+        }
+
     case XMLHttpRequest::ResponseTypeDocument:
         {
             ExceptionState es(info.GetIsolate());
             Document* document = xmlHttpRequest->responseXML(es);
             if (es.throwIfNeeded())
                 return;
             v8SetReturnValue(info, toV8Fast(document, info, xmlHttpRequest));
             return;
         }
 
@@ skipping 114 matching lines @@
             ASSERT(arrayBufferView);
             xmlHttpRequest->send(arrayBufferView, es);
         } else
             xmlHttpRequest->send(toWebCoreStringWithNullCheck(arg), es);
     }
 
     es.throwIfNeeded();
 }
 
 } // namespace WebCore