| Index: Source/bindings/v8/V8ScriptRunner.cpp
|
| diff --git a/Source/bindings/v8/V8ScriptRunner.cpp b/Source/bindings/v8/V8ScriptRunner.cpp
|
| index b4511c93478cc5ca8012a61768a0323d95dfc366..a6d8fc205a5e4c19fb7123866298ef7eef17356f 100644
|
| --- a/Source/bindings/v8/V8ScriptRunner.cpp
|
| +++ b/Source/bindings/v8/V8ScriptRunner.cpp
|
| @@ -39,7 +39,7 @@ namespace WebCore {
|
| PassOwnPtr<v8::ScriptData> V8ScriptRunner::precompileScript(v8::Handle<v8::String> code, ScriptResource* resource)
|
| {
|
| TRACE_EVENT0("v8", "v8.compile");
|
| - TRACE_EVENT_SCOPED_SAMPLING_STATE("V8", "Compile");
|
| + TRACE_EVENT_SCOPED_SAMPLING_STATE("V8", "V8Compile");
|
| // A pseudo-randomly chosen ID used to store and retrieve V8 ScriptData from
|
| // the ScriptResource. If the format changes, this ID should be changed too.
|
| static const unsigned dataTypeID = 0xECC13BD7;
|
| @@ -66,7 +66,7 @@ PassOwnPtr<v8::ScriptData> V8ScriptRunner::precompileScript(v8::Handle<v8::Strin
|
| v8::Local<v8::Script> V8ScriptRunner::compileScript(v8::Handle<v8::String> code, const String& fileName, const TextPosition& scriptStartPosition, v8::ScriptData* scriptData, v8::Isolate* isolate, AccessControlStatus corsStatus)
|
| {
|
| TRACE_EVENT0("v8", "v8.compile");
|
| - TRACE_EVENT_SCOPED_SAMPLING_STATE("V8", "Compile");
|
| + TRACE_EVENT_SCOPED_SAMPLING_STATE("V8", "V8Compile");
|
| v8::Handle<v8::String> name = v8String(isolate, fileName);
|
| v8::Handle<v8::Integer> line = v8::Integer::New(isolate, scriptStartPosition.m_line.zeroBasedInt());
|
| v8::Handle<v8::Integer> column = v8::Integer::New(isolate, scriptStartPosition.m_column.zeroBasedInt());
|
| @@ -78,7 +78,7 @@ v8::Local<v8::Script> V8ScriptRunner::compileScript(v8::Handle<v8::String> code,
|
| v8::Local<v8::Value> V8ScriptRunner::runCompiledScript(v8::Handle<v8::Script> script, ExecutionContext* context, v8::Isolate* isolate)
|
| {
|
| TRACE_EVENT0("v8", "v8.run");
|
| - TRACE_EVENT_SCOPED_SAMPLING_STATE("V8", "Execution");
|
| + TRACE_EVENT_SCOPED_SAMPLING_STATE("V8", "V8Execution");
|
| if (script.IsEmpty())
|
| return v8::Local<v8::Value>();
|
|
|
| @@ -110,7 +110,7 @@ v8::Local<v8::Value> V8ScriptRunner::runCompiledScript(v8::Handle<v8::Script> sc
|
| v8::Local<v8::Value> V8ScriptRunner::compileAndRunInternalScript(v8::Handle<v8::String> source, v8::Isolate* isolate, const String& fileName, const TextPosition& scriptStartPosition, v8::ScriptData* scriptData)
|
| {
|
| TRACE_EVENT0("v8", "v8.run");
|
| - TRACE_EVENT_SCOPED_SAMPLING_STATE("V8", "Execution");
|
| + TRACE_EVENT_SCOPED_SAMPLING_STATE("V8", "V8Execution");
|
| v8::Handle<v8::Script> script = V8ScriptRunner::compileScript(source, fileName, scriptStartPosition, scriptData, isolate);
|
| if (script.IsEmpty())
|
| return v8::Local<v8::Value>();
|
| @@ -124,7 +124,7 @@ v8::Local<v8::Value> V8ScriptRunner::compileAndRunInternalScript(v8::Handle<v8::
|
| v8::Local<v8::Value> V8ScriptRunner::callFunction(v8::Handle<v8::Function> function, ExecutionContext* context, v8::Handle<v8::Value> receiver, int argc, v8::Handle<v8::Value> info[], v8::Isolate* isolate)
|
| {
|
| TRACE_EVENT0("v8", "v8.callFunction");
|
| - TRACE_EVENT_SCOPED_SAMPLING_STATE("V8", "Execution");
|
| + TRACE_EVENT_SCOPED_SAMPLING_STATE("V8", "V8Execution");
|
|
|
| if (V8RecursionScope::recursionLevel() >= kMaxRecursionDepth)
|
| return handleMaxRecursionDepthExceeded(isolate);
|
| @@ -140,7 +140,7 @@ v8::Local<v8::Value> V8ScriptRunner::callFunction(v8::Handle<v8::Function> funct
|
| v8::Local<v8::Value> V8ScriptRunner::callInternalFunction(v8::Handle<v8::Function> function, v8::Handle<v8::Value> receiver, int argc, v8::Handle<v8::Value> info[], v8::Isolate* isolate)
|
| {
|
| TRACE_EVENT0("v8", "v8.callFunction");
|
| - TRACE_EVENT_SCOPED_SAMPLING_STATE("V8", "Execution");
|
| + TRACE_EVENT_SCOPED_SAMPLING_STATE("V8", "V8Execution");
|
| V8RecursionScope::MicrotaskSuppression recursionScope;
|
| v8::Local<v8::Value> result = function->Call(receiver, argc, info);
|
| crashIfV8IsDead();
|
| @@ -150,7 +150,7 @@ v8::Local<v8::Value> V8ScriptRunner::callInternalFunction(v8::Handle<v8::Functio
|
| v8::Local<v8::Value> V8ScriptRunner::callAsFunction(v8::Handle<v8::Object> object, v8::Handle<v8::Value> receiver, int argc, v8::Handle<v8::Value> info[])
|
| {
|
| TRACE_EVENT0("v8", "v8.callFunction");
|
| - TRACE_EVENT_SCOPED_SAMPLING_STATE("V8", "Execution");
|
| + TRACE_EVENT_SCOPED_SAMPLING_STATE("V8", "V8Execution");
|
|
|
| V8RecursionScope::MicrotaskSuppression recursionScope;
|
| v8::Local<v8::Value> result = object->CallAsFunction(receiver, argc, info);
|
| @@ -161,7 +161,7 @@ v8::Local<v8::Value> V8ScriptRunner::callAsFunction(v8::Handle<v8::Object> objec
|
| v8::Local<v8::Value> V8ScriptRunner::callAsConstructor(v8::Handle<v8::Object> object, int argc, v8::Handle<v8::Value> info[])
|
| {
|
| TRACE_EVENT0("v8", "v8.callFunction");
|
| - TRACE_EVENT_SCOPED_SAMPLING_STATE("V8", "Execution");
|
| + TRACE_EVENT_SCOPED_SAMPLING_STATE("V8", "V8Execution");
|
|
|
| V8RecursionScope::MicrotaskSuppression recursionScope;
|
| v8::Local<v8::Value> result = object->CallAsConstructor(argc, info);
|
| @@ -172,7 +172,7 @@ v8::Local<v8::Value> V8ScriptRunner::callAsConstructor(v8::Handle<v8::Object> ob
|
| v8::Local<v8::Object> V8ScriptRunner::instantiateObject(v8::Handle<v8::ObjectTemplate> objectTemplate)
|
| {
|
| TRACE_EVENT0("v8", "v8.newInstance");
|
| - TRACE_EVENT_SCOPED_SAMPLING_STATE("V8", "Execution");
|
| + TRACE_EVENT_SCOPED_SAMPLING_STATE("V8", "V8Execution");
|
|
|
| V8RecursionScope::MicrotaskSuppression scope;
|
| v8::Local<v8::Object> result = objectTemplate->NewInstance();
|
| @@ -183,7 +183,7 @@ v8::Local<v8::Object> V8ScriptRunner::instantiateObject(v8::Handle<v8::ObjectTem
|
| v8::Local<v8::Object> V8ScriptRunner::instantiateObject(v8::Handle<v8::Function> function, int argc, v8::Handle<v8::Value> argv[])
|
| {
|
| TRACE_EVENT0("v8", "v8.newInstance");
|
| - TRACE_EVENT_SCOPED_SAMPLING_STATE("V8", "Execution");
|
| + TRACE_EVENT_SCOPED_SAMPLING_STATE("V8", "V8Execution");
|
|
|
| V8RecursionScope::MicrotaskSuppression scope;
|
| v8::Local<v8::Object> result = function->NewInstance(argc, argv);
|
| @@ -194,7 +194,7 @@ v8::Local<v8::Object> V8ScriptRunner::instantiateObject(v8::Handle<v8::Function>
|
| v8::Local<v8::Object> V8ScriptRunner::instantiateObjectInDocument(v8::Handle<v8::Function> function, ExecutionContext* context, int argc, v8::Handle<v8::Value> argv[])
|
| {
|
| TRACE_EVENT0("v8", "v8.newInstance");
|
| - TRACE_EVENT_SCOPED_SAMPLING_STATE("V8", "Execution");
|
| + TRACE_EVENT_SCOPED_SAMPLING_STATE("V8", "V8Execution");
|
| V8RecursionScope scope(context);
|
| v8::Local<v8::Object> result = function->NewInstance(argc, argv);
|
| crashIfV8IsDead();
|
|
|