Switch custom XMLHttpRequest bindings over to new-style ExceptionState.

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 54 matching lines @@
     RefPtr<XMLHttpRequest> xmlHttpRequest = XMLHttpRequest::create(context, securityOrigin);
 
     v8::Handle<v8::Object> wrapper = info.Holder();
     V8DOMWrapper::associateObjectWithWrapper<V8XMLHttpRequest>(xmlHttpRequest.release(), &wrapperTypeInfo, wrapper, info.GetIsolate(), WrapperConfiguration::Dependent);
     info.GetReturnValue().Set(wrapper);
 }
 
 void V8XMLHttpRequest::responseTextAttributeGetterCustom(const v8::PropertyCallbackInfo<v8::Value>& info)
 {
     XMLHttpRequest* xmlHttpRequest = V8XMLHttpRequest::toNative(info.Holder());
-    ExceptionState exceptionState(info.Holder(), info.GetIsolate());
+    ExceptionState exceptionState(ExceptionState::GetterContext, "responseText", "XMLHttpRequest", info.Holder(), info.GetIsolate());
     ScriptValue text = xmlHttpRequest->responseText(exceptionState);
     if (exceptionState.throwIfNeeded())
         return;
     if (text.hasNoValue()) {
         v8SetReturnValueString(info, emptyString(), info.GetIsolate());
         return;
     }
     v8SetReturnValue(info, text.v8Value());
 }
 
 void V8XMLHttpRequest::responseAttributeGetterCustom(const v8::PropertyCallbackInfo<v8::Value>& info)
 {
     XMLHttpRequest* xmlHttpRequest = V8XMLHttpRequest::toNative(info.Holder());
 
     switch (xmlHttpRequest->responseTypeCode()) {
     case XMLHttpRequest::ResponseTypeDefault:
     case XMLHttpRequest::ResponseTypeText:
         responseTextAttributeGetterCustom(info);
         return;
 
     case XMLHttpRequest::ResponseTypeJSON:
         {
             v8::Isolate* isolate = info.GetIsolate();
 
-            ExceptionState exceptionState(info.Holder(), isolate);
             ScriptString jsonSource = xmlHttpRequest->responseJSONSource();
-            if (exceptionState.throwIfNeeded())

[Mike West, 2013/11/29 11:28:12]

Nice catch, thanks for removing this.

-                return;
-
             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>());
 
@@ skipping 42 matching lines @@
 }
 
 void V8XMLHttpRequest::openMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     // Four cases:
     // open(method, url)
     // open(method, url, async)
     // open(method, url, async, user)
     // open(method, url, async, user, passwd)
 
+    ExceptionState exceptionState(ExceptionState::ExecutionContext, "open", "XMLHttpRequest", info.Holder(), info.GetIsolate());
+
     if (info.Length() < 2) {
-        throwTypeError(ExceptionMessages::failedToExecute("open", "XMLHttpRequest", ExceptionMessages::notEnoughArguments(2, info.Length())), info.GetIsolate());
-        return;
-    }
+        exceptionState.throwTypeError(ExceptionMessages::notEnoughArguments(2, info.Length()));
+    } else {
+        XMLHttpRequest* xmlHttpRequest = V8XMLHttpRequest::toNative(info.Holder());
 
-    XMLHttpRequest* xmlHttpRequest = V8XMLHttpRequest::toNative(info.Holder());
+        V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, method, info[0]);
+        V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, urlstring, info[1]);
 
-    V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, method, info[0]);
-    V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, urlstring, info[1]);
+        ExecutionContext* context = getExecutionContext();
+        KURL url = context->completeURL(urlstring);
 
-    ExecutionContext* context = getExecutionContext();
-    KURL url = context->completeURL(urlstring);
+        if (info.Length() >= 3) {
+            bool async = info[2]->BooleanValue();
 
-    ExceptionState exceptionState(info.Holder(), info.GetIsolate());
+            if (info.Length() >= 4 && !info[3]->IsUndefined()) {
+                V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithNullCheck>, user, info[3]);
 
-    if (info.Length() >= 3) {
-        bool async = info[2]->BooleanValue();
-
-        if (info.Length() >= 4 && !info[3]->IsUndefined()) {
-            V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithNullCheck>, user, info[3]);
-
-            if (info.Length() >= 5 && !info[4]->IsUndefined()) {
-                V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithNullCheck>, password, info[4]);
-                xmlHttpRequest->open(method, url, async, user, password, exceptionState);
+                if (info.Length() >= 5 && !info[4]->IsUndefined()) {
+                    V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithNullCheck>, password, info[4]);
+                    xmlHttpRequest->open(method, url, async, user, password, exceptionState);
+                } else {
+                    xmlHttpRequest->open(method, url, async, user, exceptionState);
+                }
             } else {
-                xmlHttpRequest->open(method, url, async, user, exceptionState);
+                xmlHttpRequest->open(method, url, async, exceptionState);
             }
         } else {
-            xmlHttpRequest->open(method, url, async, exceptionState);
+            xmlHttpRequest->open(method, url, exceptionState);
         }
-    } else {
-        xmlHttpRequest->open(method, url, exceptionState);
     }
 
     exceptionState.throwIfNeeded();
 }
 
 static bool isDocumentType(v8::Handle<v8::Value> value, v8::Isolate* isolate, WrapperWorldType currentWorldType)
 {
     // FIXME: add other document types.
     return V8Document::hasInstance(value, isolate, currentWorldType) || V8HTMLDocument::hasInstance(value, isolate, currentWorldType);
 }
 
 void V8XMLHttpRequest::sendMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     XMLHttpRequest* xmlHttpRequest = V8XMLHttpRequest::toNative(info.Holder());
 
     InspectorInstrumentation::willSendXMLHttpRequest(xmlHttpRequest->executionContext(), xmlHttpRequest->url());
 
-    ExceptionState exceptionState(info.Holder(), info.GetIsolate());
+    ExceptionState exceptionState(ExceptionState::ExecutionContext, "send", "XMLHttpRequest", info.Holder(), info.GetIsolate());
     if (info.Length() < 1)
         xmlHttpRequest->send(exceptionState);
     else {
         v8::Handle<v8::Value> arg = info[0];
         WrapperWorldType currentWorldType = worldType(info.GetIsolate());
         if (isUndefinedOrNull(arg)) {
             xmlHttpRequest->send(exceptionState);
         } else if (isDocumentType(arg, info.GetIsolate(), currentWorldType)) {
             v8::Handle<v8::Object> object = v8::Handle<v8::Object>::Cast(arg);
             Document* document = V8Document::toNative(object);
@@ skipping 22 matching lines @@
         } else {
             V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithNullCheck>, argString, arg);
             xmlHttpRequest->send(argString, exceptionState);
         }
     }
 
     exceptionState.throwIfNeeded();
 }
 
 } // namespace WebCore