Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/core/inspector/InjectedScript.cpp

Issue 1638563002: DevTools: migrate ScriptFunctionCall off ScriptValue (to be inlined into the InjectedScript.cpp). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ready for review Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« third_party/WebKit/Source/core/inspector/DevToolsHost.h ('K') | « third_party/WebKit/Source/core/inspector/InjectedScript.h ('k') | third_party/WebKit/Source/core/inspector/v8/V8InjectedScriptHost.cpp » ('j') | third_party/WebKit/Source/platform/JSONValuesForV8.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/inspector/InjectedScript.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InjectedScript.cpp b/third_party/WebKit/Source/core/inspector/InjectedScript.cpp
index a8b7b8b55696cc869bfd4d462ffb505b5d3612ee..2cdce327be38b41bbecc8e495bfe23a8e08a9abe 100644
--- a/third_party/WebKit/Source/core/inspector/InjectedScript.cpp
+++ b/third_party/WebKit/Source/core/inspector/InjectedScript.cpp
@@ -51,14 +51,6 @@ 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;
@@ -113,14 +105,9 @@ static PassRefPtr<TypeBuilder::Debugger::ExceptionDetails> toExceptionDetails(Pa
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)
@@ -133,7 +120,8 @@ 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);
@@ -144,7 +132,8 @@ void InjectedScript::evaluate(ErrorString* errorString, const String& expression
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);
@@ -155,7 +144,8 @@ void InjectedScript::callFunctionOn(ErrorString* errorString, const String& obje
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);
@@ -169,7 +159,8 @@ void InjectedScript::evaluateOnCallFrame(ErrorString* errorString, v8::Local<v8:
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;
@@ -188,7 +179,8 @@ void InjectedScript::restartFrame(ErrorString* errorString, v8::Local<v8::Object
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;
@@ -208,7 +200,8 @@ void InjectedScript::getStepInPositions(ErrorString* errorString, v8::Local<v8::
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);
@@ -238,7 +231,8 @@ void InjectedScript::setVariableValue(ErrorString* errorString, v8::Local<v8::Ob
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);
@@ -252,7 +246,8 @@ void InjectedScript::getFunctionDetails(ErrorString* errorString, const String&
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);
@@ -266,7 +261,8 @@ void InjectedScript::getGeneratorObjectDetails(ErrorString* errorString, const S
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);
@@ -280,7 +276,8 @@ void InjectedScript::getCollectionEntries(ErrorString* errorString, const String
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);
@@ -302,7 +299,8 @@ void InjectedScript::getProperties(ErrorString* errorString, const String& objec
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;
@@ -334,13 +332,15 @@ void InjectedScript::releaseObject(const String& objectId)
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();
@@ -348,33 +348,37 @@ PassRefPtr<Array<CallFrame>> InjectedScript::wrapCallFrames(v8::Local<v8::Object
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);
}
@@ -399,9 +403,10 @@ String InjectedScript::objectIdToObjectGroupName(const String& objectId) const
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);
@@ -410,42 +415,38 @@ void InjectedScript::releaseObjectGroup(const String& objectGroup)
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)
+bool InjectedScript::canAccessInspectedWindow() const
{
- m_injectedScriptObject = injectedScriptObject;
- m_inspectedStateAccessCheck = accessCheck;
+ return m_inspectedStateAccessCheck(m_injectedScriptObject.scriptState());
}
-bool InjectedScript::canAccessInspectedWindow() const
+v8::Local<v8::Context> InjectedScript::v8Context() const
{
- return m_inspectedStateAccessCheck(m_injectedScriptObject.scriptState());
+ return m_injectedScriptObject.context();
}
-const ScriptValue& InjectedScript::injectedScriptObject() const
+v8::Local<v8::Value> InjectedScript::v8Value() const
{
- return m_injectedScriptObject;
+ return m_injectedScriptObject.v8Value();
}
-ScriptValue InjectedScript::callFunctionWithEvalEnabled(ScriptFunctionCall& function, bool& hadException) const
+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.
{
- ScriptState* scriptState = m_injectedScriptObject.scriptState();
- ScriptState::Scope scope(scriptState);
- bool evalIsDisabled = !scriptState->evalEnabled();
+ 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;
}
@@ -458,11 +459,11 @@ void InjectedScript::makeCall(ScriptFunctionCall& function, RefPtr<JSONValue>* r
}
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 {
@@ -505,15 +506,14 @@ void InjectedScript::makeEvalCall(ErrorString* errorString, ScriptFunctionCall&
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));
}
« third_party/WebKit/Source/core/inspector/DevToolsHost.h ('K') | « third_party/WebKit/Source/core/inspector/InjectedScript.h ('k') | third_party/WebKit/Source/core/inspector/v8/V8InjectedScriptHost.cpp » ('j') | third_party/WebKit/Source/platform/JSONValuesForV8.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698