DevTools: migrate ScriptFunctionCall off ScriptValue (to be inlined into the InjectedScript.cpp).

third_party/WebKit/Source/core/inspector/InjectedScript.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 33 matching lines @@
 using blink::TypeBuilder::Debugger::CallFrame;
 using blink::TypeBuilder::Debugger::CollectionEntry;
 using blink::TypeBuilder::Debugger::FunctionDetails;
 using blink::TypeBuilder::Debugger::GeneratorObjectDetails;
 using blink::TypeBuilder::Runtime::PropertyDescriptor;
 using blink::TypeBuilder::Runtime::InternalPropertyDescriptor;
 using blink::TypeBuilder::Runtime::RemoteObject;
 
 namespace blink {
 
-PassRefPtr<JSONValue> toJSONValue(const ScriptValue& value)
-{
-    ScriptState* scriptState = value.scriptState();
-    ASSERT(scriptState->contextIsValid());
-    ScriptState::Scope scope(scriptState);
-    return toJSONValue(scriptState->isolate(), value.v8Value());
-}
-
 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 34 matching lines @@
 
             frames->addItem(callFrame.release());
         }
         exceptionDetails->setStackTrace(frames.release());
     }
     if (originScriptId)
         exceptionDetails->setScriptId(String::number(originScriptId));
     return exceptionDetails.release();
 }
 
-InjectedScript::InjectedScript()
-    : m_inspectedStateAccessCheck(nullptr)
-    , m_contextId(0)
-{
-}
-
 InjectedScript::InjectedScript(ScriptValue injectedScriptObject, InspectedStateAccessCheck accessCheck, PassRefPtr<InjectedScriptNative> injectedScriptNative, int contextId)
-    : m_injectedScriptObject(injectedScriptObject)
+    : m_isolate(injectedScriptObject.isolate())
+    , m_injectedScriptObject(injectedScriptObject)
     , m_inspectedStateAccessCheck(accessCheck)
     , m_native(injectedScriptNative)
     , m_contextId(contextId)
 {
 }
 
 InjectedScript::~InjectedScript()
 {
 }
 
 void InjectedScript::evaluate(ErrorString* errorString, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown, RefPtr<TypeBuilder::Debugger::ExceptionDetails>* exceptionDetails)
 {
-    ScriptFunctionCall function(injectedScriptObject(), "evaluate");
+    ScriptState::Scope scope(m_injectedScriptObject.scriptState());

[dgozman, 2016/01/26 02:45:14]

Why do you need ScriptState::Scope at all?

[pfeldman, 2016/01/27 01:24:09]

I need a handle scope and entered context.

+    ScriptFunctionCall function(v8Context(), v8Value(), "evaluate");
     function.appendArgument(expression);
     function.appendArgument(objectGroup);
     function.appendArgument(includeCommandLineAPI);
     function.appendArgument(returnByValue);
     function.appendArgument(generatePreview);
     makeEvalCall(errorString, function, result, wasThrown, exceptionDetails);
 }
 
 void InjectedScript::callFunctionOn(ErrorString* errorString, const String& objectId, const String& expression, const String& arguments, bool returnByValue, bool generatePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown)
 {
-    ScriptFunctionCall function(injectedScriptObject(), "callFunctionOn");
+    ScriptState::Scope scope(m_injectedScriptObject.scriptState());
+    ScriptFunctionCall function(v8Context(), v8Value(), "callFunctionOn");
     function.appendArgument(objectId);
     function.appendArgument(expression);
     function.appendArgument(arguments);
     function.appendArgument(returnByValue);
     function.appendArgument(generatePreview);
     makeEvalCall(errorString, function, result, wasThrown);
 }
 
 void InjectedScript::evaluateOnCallFrame(ErrorString* errorString, v8::Local<v8::Object> callFrames, bool isAsyncCallStack, const String& callFrameId, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown, RefPtr<TypeBuilder::Debugger::ExceptionDetails>* exceptionDetails)
 {
-    ScriptFunctionCall function(injectedScriptObject(), "evaluateOnCallFrame");
+    ScriptState::Scope scope(m_injectedScriptObject.scriptState());
+    ScriptFunctionCall function(v8Context(), v8Value(), "evaluateOnCallFrame");
     function.appendArgument(callFrames);
     function.appendArgument(isAsyncCallStack);
     function.appendArgument(callFrameId);
     function.appendArgument(expression);
     function.appendArgument(objectGroup);
     function.appendArgument(includeCommandLineAPI);
     function.appendArgument(returnByValue);
     function.appendArgument(generatePreview);
     makeEvalCall(errorString, function, result, wasThrown, exceptionDetails);
 }
 
 void InjectedScript::restartFrame(ErrorString* errorString, v8::Local<v8::Object> callFrames, const String& callFrameId)
 {
-    ScriptFunctionCall function(injectedScriptObject(), "restartFrame");
+    ScriptState::Scope scope(m_injectedScriptObject.scriptState());
+    ScriptFunctionCall function(v8Context(), v8Value(), "restartFrame");
     function.appendArgument(callFrames);
     function.appendArgument(callFrameId);
     RefPtr<JSONValue> resultValue;
     makeCall(function, &resultValue);
     if (resultValue) {
         if (resultValue->type() == JSONValue::TypeString) {
             resultValue->asString(errorString);
         } else {
             bool value;
             ASSERT_UNUSED(value, resultValue->asBoolean(&value) && value);
         }
         return;
     }
     *errorString = "Internal error";
 }
 
 void InjectedScript::getStepInPositions(ErrorString* errorString, v8::Local<v8::Object> callFrames, const String& callFrameId, RefPtr<Array<TypeBuilder::Debugger::Location>>& positions)
 {
-    ScriptFunctionCall function(injectedScriptObject(), "getStepInPositions");
+    ScriptState::Scope scope(m_injectedScriptObject.scriptState());
+    ScriptFunctionCall function(v8Context(), v8Value(), "getStepInPositions");
     function.appendArgument(callFrames);
     function.appendArgument(callFrameId);
     RefPtr<JSONValue> resultValue;
     makeCall(function, &resultValue);
     if (resultValue) {
         if (resultValue->type() == JSONValue::TypeString) {
             resultValue->asString(errorString);
             return;
         }
         if (resultValue->type() == JSONValue::TypeArray) {
             positions = Array<TypeBuilder::Debugger::Location>::runtimeCast(resultValue);
             return;
         }
     }
     *errorString = "Internal error";
 }
 
 void InjectedScript::setVariableValue(ErrorString* errorString, v8::Local<v8::Object> callFrames, const String* callFrameIdOpt, const String* functionObjectIdOpt, int scopeNumber, const String& variableName, const String& newValueStr)
 {
-    ScriptFunctionCall function(injectedScriptObject(), "setVariableValue");
+    ScriptState::Scope scope(m_injectedScriptObject.scriptState());
+    ScriptFunctionCall function(v8Context(), v8Value(), "setVariableValue");
     if (callFrameIdOpt) {
         function.appendArgument(callFrames);
         function.appendArgument(*callFrameIdOpt);
     } else {
         function.appendArgument(false);
         function.appendArgument(false);
     }
     if (functionObjectIdOpt)
         function.appendArgument(*functionObjectIdOpt);
     else
         function.appendArgument(false);
     function.appendArgument(scopeNumber);
     function.appendArgument(variableName);
     function.appendArgument(newValueStr);
     RefPtr<JSONValue> resultValue;
     makeCall(function, &resultValue);
     if (!resultValue) {
         *errorString = "Internal error";
         return;
     }
     if (resultValue->type() == JSONValue::TypeString) {
         resultValue->asString(errorString);
         return;
     }
     // Normal return.
 }
 
 void InjectedScript::getFunctionDetails(ErrorString* errorString, const String& functionId, RefPtr<FunctionDetails>* result)
 {
-    ScriptFunctionCall function(injectedScriptObject(), "getFunctionDetails");
+    ScriptState::Scope scope(m_injectedScriptObject.scriptState());
+    ScriptFunctionCall function(v8Context(), v8Value(), "getFunctionDetails");
     function.appendArgument(functionId);
     RefPtr<JSONValue> resultValue;
     makeCall(function, &resultValue);
     if (!resultValue || resultValue->type() != JSONValue::TypeObject) {
         if (!resultValue->asString(errorString))
             *errorString = "Internal error";
         return;
     }
     *result = FunctionDetails::runtimeCast(resultValue);
 }
 
 void InjectedScript::getGeneratorObjectDetails(ErrorString* errorString, const String& objectId, RefPtr<GeneratorObjectDetails>* result)
 {
-    ScriptFunctionCall function(injectedScriptObject(), "getGeneratorObjectDetails");
+    ScriptState::Scope scope(m_injectedScriptObject.scriptState());
+    ScriptFunctionCall function(v8Context(), v8Value(), "getGeneratorObjectDetails");
     function.appendArgument(objectId);
     RefPtr<JSONValue> resultValue;
     makeCall(function, &resultValue);
     if (!resultValue || resultValue->type() != JSONValue::TypeObject) {
         if (!resultValue->asString(errorString))
             *errorString = "Internal error";
         return;
     }
     *result = GeneratorObjectDetails::runtimeCast(resultValue);
 }
 
 void InjectedScript::getCollectionEntries(ErrorString* errorString, const String& objectId, RefPtr<Array<CollectionEntry> >* result)
 {
-    ScriptFunctionCall function(injectedScriptObject(), "getCollectionEntries");
+    ScriptState::Scope scope(m_injectedScriptObject.scriptState());
+    ScriptFunctionCall function(v8Context(), v8Value(), "getCollectionEntries");
     function.appendArgument(objectId);
     RefPtr<JSONValue> resultValue;
     makeCall(function, &resultValue);
     if (!resultValue || resultValue->type() != JSONValue::TypeArray) {
         if (!resultValue->asString(errorString))
             *errorString = "Internal error";
         return;
     }
     *result = Array<CollectionEntry>::runtimeCast(resultValue);
 }
 
 void InjectedScript::getProperties(ErrorString* errorString, const String& objectId, bool ownProperties, bool accessorPropertiesOnly, bool generatePreview, RefPtr<Array<PropertyDescriptor>>* properties, RefPtr<TypeBuilder::Debugger::ExceptionDetails>* exceptionDetails)
 {
-    ScriptFunctionCall function(injectedScriptObject(), "getProperties");
+    ScriptState::Scope scope(m_injectedScriptObject.scriptState());
+    ScriptFunctionCall function(v8Context(), v8Value(), "getProperties");
     function.appendArgument(objectId);
     function.appendArgument(ownProperties);
     function.appendArgument(accessorPropertiesOnly);
     function.appendArgument(generatePreview);
 
     RefPtr<JSONValue> result;
     makeCallWithExceptionDetails(function, &result, exceptionDetails);
     if (*exceptionDetails) {
         // FIXME: make properties optional
         *properties = Array<PropertyDescriptor>::create();
         return;
     }
     if (!result || result->type() != JSONValue::TypeArray) {
         *errorString = "Internal error";
         return;
     }
     *properties = Array<PropertyDescriptor>::runtimeCast(result);
 }
 
 void InjectedScript::getInternalProperties(ErrorString* errorString, const String& objectId, RefPtr<Array<InternalPropertyDescriptor>>* properties, RefPtr<TypeBuilder::Debugger::ExceptionDetails>* exceptionDetails)
 {
-    ScriptFunctionCall function(injectedScriptObject(), "getInternalProperties");
+    ScriptState::Scope scope(m_injectedScriptObject.scriptState());
+    ScriptFunctionCall function(v8Context(), v8Value(), "getInternalProperties");
     function.appendArgument(objectId);
 
     RefPtr<JSONValue> result;
     makeCallWithExceptionDetails(function, &result, exceptionDetails);
     if (*exceptionDetails)
         return;
     if (!result || result->type() != JSONValue::TypeArray) {
         *errorString = "Internal error";
         return;
     }
@@ skipping 11 matching lines @@
     if (!parsedObjectId->asObject(&object))
         return;
     int boundId = 0;
     if (!object->getNumber("id", &boundId))
         return;
     m_native->unbind(boundId);
 }
 
 PassRefPtr<Array<CallFrame>> InjectedScript::wrapCallFrames(v8::Local<v8::Object> callFrames, int asyncOrdinal)
 {
-    ScriptFunctionCall function(injectedScriptObject(), "wrapCallFrames");
+    ScriptState::Scope scope(m_injectedScriptObject.scriptState());
+    v8::Local<v8::Context> context = v8Context();
+    ScriptFunctionCall function(context, v8Value(), "wrapCallFrames");
     function.appendArgument(callFrames);
     function.appendArgument(asyncOrdinal);
     bool hadException = false;
-    ScriptValue callFramesValue = callFunctionWithEvalEnabled(function, hadException);
+    v8::Local<v8::Value> callFramesValue = callFunctionWithEvalEnabled(function, hadException);
     ASSERT(!hadException);
-    RefPtr<JSONValue> result = toJSONValue(callFramesValue);
+    RefPtr<JSONValue> result = toJSONValue(context, callFramesValue);
     if (result && result->type() == JSONValue::TypeArray)
         return Array<CallFrame>::runtimeCast(result);
     return Array<CallFrame>::create();
 }
 
 PassRefPtr<TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapObject(const ScriptValue& value, const String& groupName, bool generatePreview) const
 {
-    ScriptFunctionCall wrapFunction(injectedScriptObject(), "wrapObject");
-    wrapFunction.appendArgument(value);
+    ScriptState::Scope scope(m_injectedScriptObject.scriptState());
+    v8::Local<v8::Context> context = v8Context();
+    ScriptFunctionCall wrapFunction(context, v8Value(), "wrapObject");
+    wrapFunction.appendArgument(value.v8Value());
     wrapFunction.appendArgument(groupName);
     wrapFunction.appendArgument(canAccessInspectedWindow());
     wrapFunction.appendArgument(generatePreview);
     bool hadException = false;
-    ScriptValue r = callFunctionWithEvalEnabled(wrapFunction, hadException);
+    v8::Local<v8::Value> r = callFunctionWithEvalEnabled(wrapFunction, hadException);
     if (hadException)
         return nullptr;
-    RefPtr<JSONObject> rawResult = toJSONValue(r)->asObject();
+    RefPtr<JSONObject> rawResult = toJSONValue(context, r)->asObject();
     return TypeBuilder::Runtime::RemoteObject::runtimeCast(rawResult);
 }
 
 PassRefPtr<TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapTable(const ScriptValue& table, const ScriptValue& columns) const
 {
-    ScriptFunctionCall wrapFunction(injectedScriptObject(), "wrapTable");
+    ScriptState::Scope scope(m_injectedScriptObject.scriptState());
+    v8::Local<v8::Context> context = v8Context();
+    ScriptFunctionCall wrapFunction(context, v8Value(), "wrapTable");
     wrapFunction.appendArgument(canAccessInspectedWindow());
-    wrapFunction.appendArgument(table);
+    wrapFunction.appendArgument(table.v8Value());
     if (columns.isEmpty())
         wrapFunction.appendArgument(false);
     else
-        wrapFunction.appendArgument(columns);
+        wrapFunction.appendArgument(columns.v8Value());
     bool hadException = false;
-    ScriptValue r = callFunctionWithEvalEnabled(wrapFunction, hadException);
+    v8::Local<v8::Value>  r = callFunctionWithEvalEnabled(wrapFunction, hadException);
     if (hadException)
         return nullptr;
-    RefPtr<JSONObject> rawResult = toJSONValue(r)->asObject();
+    RefPtr<JSONObject> rawResult = toJSONValue(context, r)->asObject();
     return TypeBuilder::Runtime::RemoteObject::runtimeCast(rawResult);
 }
 
 v8::Local<v8::Value> InjectedScript::findObject(const RemoteObjectId& objectId) const
 {
     return m_native->objectForId(objectId.id());
 }
 
 String InjectedScript::objectIdToObjectGroupName(const String& objectId) const
 {
     RefPtr<JSONValue> parsedObjectId = parseJSON(objectId);
     if (!parsedObjectId)
         return String();
     RefPtr<JSONObject> object;
     if (!parsedObjectId->asObject(&object))
         return String();
     int boundId = 0;
     if (!object->getNumber("id", &boundId))
         return String();
     return m_native->groupName(boundId);
 }
 
 void InjectedScript::releaseObjectGroup(const String& objectGroup)
 {
+    ScriptState::Scope scope(m_injectedScriptObject.scriptState());
     m_native->releaseObjectGroup(objectGroup);
     if (objectGroup == "console") {
-        ScriptFunctionCall releaseFunction(injectedScriptObject(), "clearLastEvaluationResult");
+        ScriptFunctionCall releaseFunction(v8Context(), v8Value(), "clearLastEvaluationResult");
         bool hadException = false;
         callFunctionWithEvalEnabled(releaseFunction, hadException);
         ASSERT(!hadException);
     }
 }
 
 void InjectedScript::setCustomObjectFormatterEnabled(bool enabled)
 {
-    ScriptFunctionCall function(injectedScriptObject(), "setCustomObjectFormatterEnabled");
+    ScriptState::Scope scope(m_injectedScriptObject.scriptState());
+    ScriptFunctionCall function(v8Context(), v8Value(), "setCustomObjectFormatterEnabled");
     function.appendArgument(enabled);
     RefPtr<JSONValue> result;
     makeCall(function, &result);
 }
 
-void InjectedScript::initialize(ScriptValue injectedScriptObject, InspectedStateAccessCheck accessCheck)
-{
-    m_injectedScriptObject = injectedScriptObject;
-    m_inspectedStateAccessCheck = accessCheck;
-}
-
 bool InjectedScript::canAccessInspectedWindow() const
 {
     return m_inspectedStateAccessCheck(m_injectedScriptObject.scriptState());
 }
 
-const ScriptValue& InjectedScript::injectedScriptObject() const
+v8::Local<v8::Context> InjectedScript::v8Context() const
 {
-    return m_injectedScriptObject;
+    return m_injectedScriptObject.context();
 }
 
-ScriptValue InjectedScript::callFunctionWithEvalEnabled(ScriptFunctionCall& function, bool& hadException) const
+v8::Local<v8::Value> InjectedScript::v8Value() const
 {
-    ScriptState* scriptState = m_injectedScriptObject.scriptState();
-    ScriptState::Scope scope(scriptState);
-    bool evalIsDisabled = !scriptState->evalEnabled();
+    return m_injectedScriptObject.v8Value();
+}
+
+v8::Local<v8::Value> InjectedScript::callFunctionWithEvalEnabled(ScriptFunctionCall& function, bool& hadException) const

[dgozman, 2016/01/26 02:45:15]

Non-const references are prohibited.

[pfeldman, 2016/01/27 01:24:09]

this comes from lhs. i'll fix it.

+{
+    v8::Local<v8::Context> context = v8Context();
+    bool evalIsDisabled = !context->IsCodeGenerationFromStringsAllowed();
     // Temporarily enable allow evals for inspector.
     if (evalIsDisabled)
-        scriptState->setEvalEnabled(true);
-
-    ScriptValue resultValue = function.call(hadException);
-
+        context->AllowCodeGenerationFromStrings(true);
+    v8::Local<v8::Value> resultValue = function.call(hadException);
     if (evalIsDisabled)
-        scriptState->setEvalEnabled(false);
-
+        context->AllowCodeGenerationFromStrings(false);
     TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateCounters", TRACE_EVENT_SCOPE_THREAD, "data", InspectorUpdateCountersEvent::data());
     return resultValue;
 }
 
 void InjectedScript::makeCall(ScriptFunctionCall& function, RefPtr<JSONValue>* result)
 {
     if (!canAccessInspectedWindow()) {
         *result = JSONValue::null();
         return;
     }
 
     bool hadException = false;
-    ScriptValue resultValue = callFunctionWithEvalEnabled(function, hadException);
+    v8::Local<v8::Value> resultValue = callFunctionWithEvalEnabled(function, hadException);
 
     ASSERT(!hadException);
     if (!hadException) {
-        *result = toJSONValue(resultValue);
+        *result = toJSONValue(function.context(), resultValue);
         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 InjectedScript::makeEvalCall(ErrorString* errorString, ScriptFunctionCall& function, RefPtr<TypeBuilder::Runtime::RemoteObject>* objectResult, TypeBuilder::OptOutput<bool>* wasThrown, RefPtr<TypeBuilder::Debugger::ExceptionDetails>* exceptionDetails)
 {
     RefPtr<JSONValue> result;
@@ skipping 22 matching lines @@
         RefPtr<JSONObject> objectExceptionDetails = resultPair->getObject("exceptionDetails");
         if (objectExceptionDetails)
             *exceptionDetails = toExceptionDetails(objectExceptionDetails.release());
     }
     *objectResult = TypeBuilder::Runtime::RemoteObject::runtimeCast(resultObj);
     *wasThrown = wasThrownVal;
 }
 
 void InjectedScript::makeCallWithExceptionDetails(ScriptFunctionCall& function, RefPtr<JSONValue>* result, RefPtr<TypeBuilder::Debugger::ExceptionDetails>* exceptionDetails)
 {
-    ScriptState::Scope scope(injectedScriptObject().scriptState());
-    v8::TryCatch tryCatch(injectedScriptObject().isolate());
-    ScriptValue resultValue = function.callWithoutExceptionHandling();
+    v8::TryCatch tryCatch(m_isolate);
+    v8::Local<v8::Value> resultValue = function.callWithoutExceptionHandling();
     if (tryCatch.HasCaught()) {
         v8::Local<v8::Message> message = tryCatch.Message();
         String text = !message.IsEmpty() ? toCoreStringWithUndefinedOrNullCheck(message->Get()) : "Internal error";
         *exceptionDetails = TypeBuilder::Debugger::ExceptionDetails::create().setText(text);
     } else {
-        *result = toJSONValue(resultValue);
+        *result = toJSONValue(function.context(), resultValue);
         if (!*result)
             *result = JSONString::create(String::format("Object has too long reference chain(must not be longer than %d)", JSONValue::maxDepth));
     }
 }
 
 } // namespace blink