| Index: Source/core/inspector/InjectedScriptBase.cpp
|
| diff --git a/Source/core/inspector/InjectedScriptBase.cpp b/Source/core/inspector/InjectedScriptBase.cpp
|
| index 6799ba9beb8c8794f99b1d70cfba9b14ed608f07..a229781f04f9b68d6e3491da7cb706e6d2e66c27 100644
|
| --- a/Source/core/inspector/InjectedScriptBase.cpp
|
| +++ b/Source/core/inspector/InjectedScriptBase.cpp
|
| @@ -142,8 +142,11 @@ ScriptValue InjectedScriptBase::callFunctionWithEvalEnabled(ScriptFunctionCall&
|
| {
|
| ASSERT(!isEmpty());
|
| ExecutionContext* executionContext = m_injectedScriptObject.scriptState()->executionContext();
|
| - TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "FunctionCall", "data", InspectorFunctionCallEvent::data(executionContext, 0, name(), 1));
|
| - InspectorInstrumentationCookie cookie = InspectorInstrumentation::willCallFunction(executionContext, DevToolsFunctionInfo(0, name(), 1));
|
| + ScriptState::Scope scope(m_injectedScriptObject.scriptState());
|
| + v8::Handle<v8::Function> functionObj = function.function();
|
| + DevToolsFunctionInfo info(functionObj);
|
| + TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "FunctionCall", "data", InspectorFunctionCallEvent::data(executionContext, info.scriptId(), info.resourceName(), info.lineNumber()));
|
| + InspectorInstrumentationCookie cookie = InspectorInstrumentation::willCallFunction(executionContext, info);
|
|
|
| ScriptState* scriptState = m_injectedScriptObject.scriptState();
|
| bool evalIsDisabled = false;
|
|
|