Add more FunctionCall trace events

Source/bindings/v8/V8WorkerGlobalScopeEventListener.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 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 61 matching lines @@
 
     // Enter the V8 context in which to perform the event handling.
     v8::Context::Scope scope(v8Context);
 
     // Get the V8 wrapper for the event object.
     v8::Handle<v8::Value> jsEvent = toV8(event, v8::Handle<v8::Object>(), isolate);
 
     invokeEventHandler(context, event, v8::Local<v8::Value>::New(isolate, jsEvent));
 }
 
-static void devtoolsFunctionInfo(v8::Handle<v8::Function> handlerFunction, v8::Isolate* isolate, int& scriptId, String& resourceName, int& lineNumber)
-{
-    lineNumber = 1;
-    v8::Handle<v8::Function> originalFunction = getBoundFunction(handlerFunction);
-    v8::ScriptOrigin origin = originalFunction->GetScriptOrigin();
-    if (!origin.ResourceName().IsEmpty()) {
-        resourceName = NativeValueTraits<String>::nativeValue(origin.ResourceName(), isolate);
-        lineNumber = originalFunction->GetScriptLineNumber() + 1;
-    }
-    if (resourceName.isEmpty())
-        resourceName = "undefined";
-}
-
-static PassRefPtr<TraceEvent::ConvertableToTraceFormat> devtoolsTraceEventData(ExecutionContext* context, v8::Handle<v8::Function> handlerFunction, v8::Isolate* isolate)
-{
-    int scriptId = 0;
-    String resourceName;
-    int lineNumber = 1;
-    devtoolsFunctionInfo(handlerFunction, isolate, scriptId, resourceName, lineNumber);
-    return InspectorFunctionCallEvent::data(context, scriptId, resourceName, lineNumber);
-}
-
 v8::Local<v8::Value> V8WorkerGlobalScopeEventListener::callListenerFunction(ExecutionContext* context, v8::Handle<v8::Value> jsEvent, Event* event)
 {
     v8::Local<v8::Function> handlerFunction = getListenerFunction(context);
     v8::Local<v8::Object> receiver = getReceiverObject(context, event);
     if (handlerFunction.IsEmpty() || receiver.IsEmpty())
         return v8::Local<v8::Value>();
 
     v8::Isolate* isolate = toIsolate(context);
-    TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "FunctionCall", "data", devtoolsTraceEventData(context, handlerFunction, isolate));
+    TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "FunctionCall", "data", devToolsTraceEventData(context, handlerFunction, isolate));
+    TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack());
     // FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeline migrates to tracing.
     InspectorInstrumentationCookie cookie;
     if (InspectorInstrumentation::timelineAgentEnabled(context)) {
         int scriptId = 0;
         String resourceName;
         int lineNumber = 1;
-        devtoolsFunctionInfo(handlerFunction, isolate, scriptId, resourceName, lineNumber);
+        GetDevToolsFunctionInfo(handlerFunction, isolate, scriptId, resourceName, lineNumber);
         cookie = InspectorInstrumentation::willCallFunction(context, scriptId, resourceName, lineNumber);
     }
 
     v8::Handle<v8::Value> parameters[1] = { jsEvent };
     v8::Local<v8::Value> result = V8ScriptRunner::callFunction(handlerFunction, context, receiver, WTF_ARRAY_LENGTH(parameters), parameters, isolate);
 
     InspectorInstrumentation::didCallFunction(cookie);
     TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateCounters", "data", InspectorUpdateCountersEvent::data());
 
     return result;
 }
 
 v8::Local<v8::Object> V8WorkerGlobalScopeEventListener::getReceiverObject(ExecutionContext* context, Event* event)
 {
     v8::Local<v8::Object> listener = getListenerObject(context);
 
     if (!listener.IsEmpty() && !listener->IsFunction())
         return listener;
 
     EventTarget* target = event->currentTarget();
     v8::Isolate* isolate = toIsolate(context);
     v8::Handle<v8::Value> value = toV8(target, v8::Handle<v8::Object>(), isolate);
     if (value.IsEmpty())
         return v8::Local<v8::Object>();
     return v8::Local<v8::Object>::New(isolate, v8::Handle<v8::Object>::Cast(value));
 }
 
 } // namespace WebCore