| Index: sky/engine/bindings/core/v8/ScriptController.cpp
|
| diff --git a/sky/engine/bindings/core/v8/ScriptController.cpp b/sky/engine/bindings/core/v8/ScriptController.cpp
|
| index ffc6aeefd5ce3126a21b1115d27ab5d1f4266c15..6ec78c1cbdea8afff92983c328290e038993990d 100644
|
| --- a/sky/engine/bindings/core/v8/ScriptController.cpp
|
| +++ b/sky/engine/bindings/core/v8/ScriptController.cpp
|
| @@ -56,7 +56,6 @@
|
| #include "sky/engine/core/html/imports/HTMLImportChild.h"
|
| #include "sky/engine/core/html/imports/HTMLImportLoader.h"
|
| #include "sky/engine/core/html/parser/HTMLDocumentParser.h"
|
| -#include "sky/engine/core/inspector/InspectorTraceEvents.h"
|
| #include "sky/engine/core/loader/FrameLoaderClient.h"
|
| #include "sky/engine/platform/NotImplemented.h"
|
| #include "sky/engine/platform/TraceEvent.h"
|
| @@ -112,17 +111,11 @@ v8::Local<v8::Value> ScriptController::callFunction(v8::Handle<v8::Function> fun
|
|
|
| v8::Local<v8::Value> ScriptController::callFunction(ExecutionContext* context, v8::Handle<v8::Function> function, v8::Handle<v8::Value> receiver, int argc, v8::Handle<v8::Value> info[], v8::Isolate* isolate)
|
| {
|
| - TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "FunctionCall", "data", devToolsTraceEventData(context, function, isolate));
|
| - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack());
|
| -
|
| return V8ScriptRunner::callFunction(function, context, receiver, argc, info, isolate);
|
| }
|
|
|
| v8::Local<v8::Value> ScriptController::executeScriptAndReturnValue(v8::Handle<v8::Context> context, const ScriptSourceCode& source)
|
| {
|
| - TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "EvaluateScript", "data", InspectorEvaluateScriptEvent::data(source.url().string(), source.startLine()));
|
| - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack());
|
| -
|
| v8::Local<v8::Value> result;
|
| {
|
| V8CacheOptions v8CacheOptions(V8CacheOptionsOff);
|
| @@ -144,8 +137,6 @@ v8::Local<v8::Value> ScriptController::executeScriptAndReturnValue(v8::Handle<v8
|
| ASSERT(!tryCatch.HasCaught() || result.IsEmpty());
|
| }
|
|
|
| - TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateCounters", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorUpdateCountersEvent::data());
|
| -
|
| return result;
|
| }
|
|
|
|
|