[bindings] [devtools] Migrate the usage of ScriptValue.toJSONValue() to ScriptValue::to<JSONValuePt…

Source/core/inspector/InjectedScriptBase.cpp

 /*
  * Copyright (C) 2012 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 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 
 
 #include "core/inspector/InjectedScriptBase.h"
 
 #include "bindings/core/v8/ScriptFunctionCall.h"
+#include "bindings/core/v8/V8Binding.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/InspectorTraceEvents.h"
 #include "platform/JSONValues.h"
 #include "wtf/text/WTFString.h"
 
 using blink::TypeBuilder::Array;
 using blink::TypeBuilder::Runtime::RemoteObject;
 
 namespace blink {
 
+PassRefPtr<JSONValue> toJSONValue(const ScriptValue& value)
+{
+    ScriptState* scriptState = value.scriptState();
+    ASSERT(scriptState->contextIsValid());
+    ScriptState::Scope scope(scriptState);
+    NonThrowableExceptionState exceptionState;
+    return ScriptValue::to<JSONValuePtr>(scriptState->isolate(), value, exceptionState);

[haraken, 2015/03/25 04:39:15]

Nit: As far as I see V8Binding.h, toScriptValue (not ScriptValue::to) might be
more consistent with other conversion methods. It seems bindings use Value::from
and toValue.

+}
+
 static PassRefPtr<TypeBuilder::Debugger::ExceptionDetails> toExceptionDetails(PassRefPtr<JSONObject> object)
 {
     String text;
     if (!object->getString("text", &text))
         return nullptr;
 
     RefPtr<TypeBuilder::Debugger::ExceptionDetails> exceptionDetails = TypeBuilder::Debugger::ExceptionDetails::create().setText(text);
     String url;
     if (object->getString("url", &url))
         exceptionDetails->setUrl(url);
@@ skipping 102 matching lines @@
     if (isEmpty() || !canAccessInspectedWindow()) {
         *result = JSONValue::null();
         return;
     }
 
     bool hadException = false;
     ScriptValue resultValue = callFunctionWithEvalEnabled(function, hadException);
 
     ASSERT(!hadException);
     if (!hadException) {
-        *result = resultValue.toJSONValue(m_injectedScriptObject.scriptState());
+        *result =  toJSONValue(resultValue);

[haraken, 2015/03/25 04:39:15]

Unnecessary space.

         if (!*result)
             *result = JSONString::create(String::format("Object has too long reference chain(must not be longer than %d)", JSONValue::maxDepth));
     } else {
         *result = JSONString::create("Exception while making a call.");
     }
 }
 
 void InjectedScriptBase::makeEvalCall(ErrorString* errorString, ScriptFunctionCall& function, RefPtr<TypeBuilder::Runtime::RemoteObject>* objectResult, TypeBuilder::OptOutput<bool>* wasThrown, RefPtr<TypeBuilder::Debugger::ExceptionDetails>* exceptionDetails)
 {
     RefPtr<JSONValue> result;
@@ skipping 21 matching lines @@
     if (wasThrownVal) {
         RefPtr<JSONObject> objectExceptionDetails = resultPair->getObject("exceptionDetails");
         if (objectExceptionDetails)
             *exceptionDetails = toExceptionDetails(objectExceptionDetails.release());
     }
     *objectResult = TypeBuilder::Runtime::RemoteObject::runtimeCast(resultObj);
     *wasThrown = wasThrownVal;
 }
 
 } // namespace blink