| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008, 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2008, 2009 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2009 Apple Inc. All rights reserved. | 3 * Copyright (C) 2009 Apple Inc. All rights reserved. |
| 4 * Copyright (C) 2014 Opera Software ASA. All rights reserved. | 4 * Copyright (C) 2014 Opera Software ASA. All rights reserved. |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions are | 7 * modification, are permitted provided that the following conditions are |
| 8 * met: | 8 * met: |
| 9 * | 9 * |
| 10 * * Redistributions of source code must retain the above copyright | 10 * * Redistributions of source code must retain the above copyright |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame.get()); | 153 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame.get()); |
| 154 return ScriptController::callFunction(m_frame->document(), function, receive
r, argc, info, m_isolate); | 154 return ScriptController::callFunction(m_frame->document(), function, receive
r, argc, info, m_isolate); |
| 155 } | 155 } |
| 156 | 156 |
| 157 v8::Local<v8::Value> ScriptController::callFunction(ExecutionContext* context, v
8::Handle<v8::Function> function, v8::Handle<v8::Value> receiver, int argc, v8::
Handle<v8::Value> info[], v8::Isolate* isolate) | 157 v8::Local<v8::Value> ScriptController::callFunction(ExecutionContext* context, v
8::Handle<v8::Function> function, v8::Handle<v8::Value> receiver, int argc, v8::
Handle<v8::Value> info[], v8::Isolate* isolate) |
| 158 { | 158 { |
| 159 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "FunctionCall",
"data", devToolsTraceEventData(isolate, context, function)); | 159 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "FunctionCall",
"data", devToolsTraceEventData(isolate, context, function)); |
| 160 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "
CallStack", "stack", InspectorCallStackEvent::currentCallStack()); | 160 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "
CallStack", "stack", InspectorCallStackEvent::currentCallStack()); |
| 161 // FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeli
ne migrates to tracing. | 161 // FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeli
ne migrates to tracing. |
| 162 InspectorInstrumentationCookie cookie; | 162 InspectorInstrumentationCookie cookie; |
| 163 if (InspectorInstrumentation::timelineAgentEnabled(context)) { | 163 if (InspectorInstrumentation::hasFrontends()) { |
| 164 int scriptId = 0; | 164 int scriptId = 0; |
| 165 String resourceName; | 165 String resourceName; |
| 166 int lineNumber = 1; | 166 int lineNumber = 1; |
| 167 GetDevToolsFunctionInfo(function, isolate, scriptId, resourceName, lineN
umber); | 167 GetDevToolsFunctionInfo(function, isolate, scriptId, resourceName, lineN
umber); |
| 168 cookie = InspectorInstrumentation::willCallFunction(context, scriptId, r
esourceName, lineNumber); | 168 cookie = InspectorInstrumentation::willCallFunction(context, scriptId, r
esourceName, lineNumber); |
| 169 } | 169 } |
| 170 | 170 |
| 171 v8::Local<v8::Value> result = V8ScriptRunner::callFunction(function, context
, receiver, argc, info, isolate); | 171 v8::Local<v8::Value> result = V8ScriptRunner::callFunction(function, context
, receiver, argc, info, isolate); |
| 172 | 172 |
| 173 InspectorInstrumentation::didCallFunction(cookie); | 173 InspectorInstrumentation::didCallFunction(cookie); |
| (...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 647 resultArray->Set(i, evaluationResult); | 647 resultArray->Set(i, evaluationResult); |
| 648 } | 648 } |
| 649 | 649 |
| 650 if (results) { | 650 if (results) { |
| 651 for (size_t i = 0; i < resultArray->Length(); ++i) | 651 for (size_t i = 0; i < resultArray->Length(); ++i) |
| 652 results->append(resultArray->Get(i)); | 652 results->append(resultArray->Get(i)); |
| 653 } | 653 } |
| 654 } | 654 } |
| 655 | 655 |
| 656 } // namespace blink | 656 } // namespace blink |
| OLD | NEW |