Chromium Code Reviews| Index: Source/bindings/tests/results/V8TestObject.cpp |
| diff --git a/Source/bindings/tests/results/V8TestObject.cpp b/Source/bindings/tests/results/V8TestObject.cpp |
| index 14e2c60c59862f7c7d31e91d603c0fd9f9e463a9..19c0470943f5190ecf2965b8d580d803a06a1846 100644 |
| --- a/Source/bindings/tests/results/V8TestObject.cpp |
| +++ b/Source/bindings/tests/results/V8TestObject.cpp |
| @@ -1653,7 +1653,8 @@ static void activityLoggingAccessForAllWorldsLongAttributeAttributeGetter(const |
| static void activityLoggingAccessForAllWorldsLongAttributeAttributeGetterCallback(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Value>& info) |
| { |
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter"); |
| - V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext()); |
| + ScriptState* scriptState = ScriptState::from(info.GetIsolate()->GetCurrentContext()); |
| + V8PerContextData* contextData = scriptState->perContextData(); |
| if (contextData && contextData->activityLogger()) |
| contextData->activityLogger()->logGetter("TestObject.activityLoggingAccessForAllWorldsLongAttribute"); |
| TestObjectV8Internal::activityLoggingAccessForAllWorldsLongAttributeAttributeGetter(info); |
| @@ -1672,7 +1673,8 @@ static void activityLoggingAccessForAllWorldsLongAttributeAttributeSetter(v8::Lo |
| static void activityLoggingAccessForAllWorldsLongAttributeAttributeSetterCallback(v8::Local<v8::String>, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info) |
| { |
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter"); |
| - V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext()); |
| + ScriptState* scriptState = ScriptState::from(info.GetIsolate()->GetCurrentContext()); |
| + V8PerContextData* contextData = scriptState->perContextData(); |
| if (contextData && contextData->activityLogger()) { |
| contextData->activityLogger()->logSetter("TestObject.activityLoggingAccessForAllWorldsLongAttribute", v8Value); |
| } |
| @@ -1690,7 +1692,8 @@ static void activityLoggingGetterForAllWorldsLongAttributeAttributeGetter(const |
| static void activityLoggingGetterForAllWorldsLongAttributeAttributeGetterCallback(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Value>& info) |
| { |
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter"); |
| - V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext()); |
| + ScriptState* scriptState = ScriptState::from(info.GetIsolate()->GetCurrentContext()); |
| + V8PerContextData* contextData = scriptState->perContextData(); |
| if (contextData && contextData->activityLogger()) |
| contextData->activityLogger()->logGetter("TestObject.activityLoggingGetterForAllWorldsLongAttribute"); |
| TestObjectV8Internal::activityLoggingGetterForAllWorldsLongAttributeAttributeGetter(info); |
| @@ -1739,7 +1742,8 @@ static void activityLoggingSetterForAllWorldsLongAttributeAttributeSetter(v8::Lo |
| static void activityLoggingSetterForAllWorldsLongAttributeAttributeSetterCallback(v8::Local<v8::String>, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info) |
| { |
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter"); |
| - V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext()); |
| + ScriptState* scriptState = ScriptState::from(info.GetIsolate()->GetCurrentContext()); |
| + V8PerContextData* contextData = scriptState->perContextData(); |
| if (contextData && contextData->activityLogger()) { |
| contextData->activityLogger()->logSetter("TestObject.activityLoggingSetterForAllWorldsLongAttribute", v8Value); |
| } |
| @@ -2476,7 +2480,8 @@ static void activityLoggingAccessPerWorldBindingsLongAttributeAttributeGetter(co |
| static void activityLoggingAccessPerWorldBindingsLongAttributeAttributeGetterCallback(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Value>& info) |
| { |
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter"); |
| - V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext()); |
| + ScriptState* scriptState = ScriptState::from(info.GetIsolate()->GetCurrentContext()); |
| + V8PerContextData* contextData = scriptState->perContextData(); |
| if (contextData && contextData->activityLogger()) |
| contextData->activityLogger()->logGetter("TestObject.activityLoggingAccessPerWorldBindingsLongAttribute"); |
| TestObjectV8Internal::activityLoggingAccessPerWorldBindingsLongAttributeAttributeGetter(info); |
| @@ -2495,7 +2500,8 @@ static void activityLoggingAccessPerWorldBindingsLongAttributeAttributeSetter(v8 |
| static void activityLoggingAccessPerWorldBindingsLongAttributeAttributeSetterCallback(v8::Local<v8::String>, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info) |
| { |
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter"); |
| - V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext()); |
| + ScriptState* scriptState = ScriptState::from(info.GetIsolate()->GetCurrentContext()); |
| + V8PerContextData* contextData = scriptState->perContextData(); |
| if (contextData && contextData->activityLogger()) { |
| contextData->activityLogger()->logSetter("TestObject.activityLoggingAccessPerWorldBindingsLongAttribute", v8Value); |
| } |
| @@ -2513,7 +2519,8 @@ static void activityLoggingAccessPerWorldBindingsLongAttributeAttributeGetterFor |
| static void activityLoggingAccessPerWorldBindingsLongAttributeAttributeGetterCallbackForMainWorld(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Value>& info) |
| { |
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter"); |
| - V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext()); |
| + ScriptState* scriptState = ScriptState::from(info.GetIsolate()->GetCurrentContext()); |
| + V8PerContextData* contextData = scriptState->perContextData(); |
| if (contextData && contextData->activityLogger()) |
| contextData->activityLogger()->logGetter("TestObject.activityLoggingAccessPerWorldBindingsLongAttribute"); |
| TestObjectV8Internal::activityLoggingAccessPerWorldBindingsLongAttributeAttributeGetterForMainWorld(info); |
| @@ -2532,7 +2539,8 @@ static void activityLoggingAccessPerWorldBindingsLongAttributeAttributeSetterFor |
| static void activityLoggingAccessPerWorldBindingsLongAttributeAttributeSetterCallbackForMainWorld(v8::Local<v8::String>, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info) |
| { |
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter"); |
| - V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext()); |
| + ScriptState* scriptState = ScriptState::from(info.GetIsolate()->GetCurrentContext()); |
| + V8PerContextData* contextData = scriptState->perContextData(); |
| if (contextData && contextData->activityLogger()) { |
| contextData->activityLogger()->logSetter("TestObject.activityLoggingAccessPerWorldBindingsLongAttribute", v8Value); |
| } |
| @@ -2550,7 +2558,8 @@ static void activityLoggingAccessForIsolatedWorldsPerWorldBindingsLongAttributeA |
| static void activityLoggingAccessForIsolatedWorldsPerWorldBindingsLongAttributeAttributeGetterCallback(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Value>& info) |
| { |
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter"); |
| - V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext()); |
| + ScriptState* scriptState = ScriptState::from(info.GetIsolate()->GetCurrentContext()); |
| + V8PerContextData* contextData = scriptState->perContextData(); |
| if (contextData && contextData->activityLogger()) |
| contextData->activityLogger()->logGetter("TestObject.activityLoggingAccessForIsolatedWorldsPerWorldBindingsLongAttribute"); |
| TestObjectV8Internal::activityLoggingAccessForIsolatedWorldsPerWorldBindingsLongAttributeAttributeGetter(info); |
| @@ -2569,7 +2578,8 @@ static void activityLoggingAccessForIsolatedWorldsPerWorldBindingsLongAttributeA |
| static void activityLoggingAccessForIsolatedWorldsPerWorldBindingsLongAttributeAttributeSetterCallback(v8::Local<v8::String>, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info) |
| { |
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter"); |
| - V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext()); |
| + ScriptState* scriptState = ScriptState::from(info.GetIsolate()->GetCurrentContext()); |
| + V8PerContextData* contextData = scriptState->perContextData(); |
| if (contextData && contextData->activityLogger()) { |
| contextData->activityLogger()->logSetter("TestObject.activityLoggingAccessForIsolatedWorldsPerWorldBindingsLongAttribute", v8Value); |
| } |
| @@ -2617,7 +2627,8 @@ static void activityLoggingGetterPerWorldBindingsLongAttributeAttributeGetter(co |
| static void activityLoggingGetterPerWorldBindingsLongAttributeAttributeGetterCallback(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Value>& info) |
| { |
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter"); |
| - V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext()); |
| + ScriptState* scriptState = ScriptState::from(info.GetIsolate()->GetCurrentContext()); |
| + V8PerContextData* contextData = scriptState->perContextData(); |
| if (contextData && contextData->activityLogger()) |
| contextData->activityLogger()->logGetter("TestObject.activityLoggingGetterPerWorldBindingsLongAttribute"); |
| TestObjectV8Internal::activityLoggingGetterPerWorldBindingsLongAttributeAttributeGetter(info); |
| @@ -2650,7 +2661,8 @@ static void activityLoggingGetterPerWorldBindingsLongAttributeAttributeGetterFor |
| static void activityLoggingGetterPerWorldBindingsLongAttributeAttributeGetterCallbackForMainWorld(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Value>& info) |
| { |
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter"); |
| - V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext()); |
| + ScriptState* scriptState = ScriptState::from(info.GetIsolate()->GetCurrentContext()); |
| + V8PerContextData* contextData = scriptState->perContextData(); |
| if (contextData && contextData->activityLogger()) |
| contextData->activityLogger()->logGetter("TestObject.activityLoggingGetterPerWorldBindingsLongAttribute"); |
| TestObjectV8Internal::activityLoggingGetterPerWorldBindingsLongAttributeAttributeGetterForMainWorld(info); |
| @@ -2683,7 +2695,8 @@ static void activityLoggingGetterForIsolatedWorldsPerWorldBindingsLongAttributeA |
| static void activityLoggingGetterForIsolatedWorldsPerWorldBindingsLongAttributeAttributeGetterCallback(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Value>& info) |
| { |
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter"); |
| - V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext()); |
| + ScriptState* scriptState = ScriptState::from(info.GetIsolate()->GetCurrentContext()); |
| + V8PerContextData* contextData = scriptState->perContextData(); |
| if (contextData && contextData->activityLogger()) |
| contextData->activityLogger()->logGetter("TestObject.activityLoggingGetterForIsolatedWorldsPerWorldBindingsLongAttribute"); |
| TestObjectV8Internal::activityLoggingGetterForIsolatedWorldsPerWorldBindingsLongAttributeAttributeGetter(info); |
| @@ -4341,8 +4354,9 @@ static void activityLoggingSetterOnlyLogPreviousValueAttributeAttributeSetter(v8 |
| static void activityLoggingSetterOnlyLogPreviousValueAttributeAttributeSetterCallback(v8::Local<v8::String>, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info) |
| { |
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter"); |
| - V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext()); |
| - if (contextData && contextData->activityLogger()) { |
| + ScriptState* scriptState = ScriptState::from(info.GetIsolate()->GetCurrentContext()); |
| + V8PerContextData* contextData = scriptState->perContextData(); |
| + if (contextData && contextData->activityLogger() && scriptState->world().isIsolatedWorld()) { |
|
haraken
2014/06/17 01:22:34
Nit: I'd check scriptState->world().isIsolatedWorl
pmarch
2014/06/17 10:00:05
Done.
|
| TestObject* impl = V8TestObject::toNative(info.Holder()); |
| int original = impl->activityLoggingSetterOnlyLogPreviousValueAttribute(); |
| v8::Handle<v8::Value> originalValue = v8::Integer::New(info.GetIsolate(), impl->activityLoggingSetterOnlyLogPreviousValueAttribute()); |
| @@ -4362,8 +4376,9 @@ static void activityLoggingLogPreviousValueInterfaceAttributeAttributeGetter(con |
| static void activityLoggingLogPreviousValueInterfaceAttributeAttributeGetterCallback(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Value>& info) |
| { |
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMGetter"); |
| - V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext()); |
| - if (contextData && contextData->activityLogger()) |
| + ScriptState* scriptState = ScriptState::from(info.GetIsolate()->GetCurrentContext()); |
| + V8PerContextData* contextData = scriptState->perContextData(); |
| + if (contextData && contextData->activityLogger() && scriptState->world().isIsolatedWorld()) |
| contextData->activityLogger()->logGetter("TestObject.activityLoggingLogPreviousValueInterfaceAttribute"); |
| TestObjectV8Internal::activityLoggingLogPreviousValueInterfaceAttributeAttributeGetter(info); |
| TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution"); |
| @@ -4380,8 +4395,9 @@ static void activityLoggingLogPreviousValueInterfaceAttributeAttributeSetter(v8: |
| static void activityLoggingLogPreviousValueInterfaceAttributeAttributeSetterCallback(v8::Local<v8::String>, v8::Local<v8::Value> v8Value, const v8::PropertyCallbackInfo<void>& info) |
| { |
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMSetter"); |
| - V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext()); |
| - if (contextData && contextData->activityLogger()) { |
| + ScriptState* scriptState = ScriptState::from(info.GetIsolate()->GetCurrentContext()); |
| + V8PerContextData* contextData = scriptState->perContextData(); |
| + if (contextData && contextData->activityLogger() && scriptState->world().isIsolatedWorld()) { |
| TestObject* impl = V8TestObject::toNative(info.Holder()); |
| RefPtr<TestInterfaceEmpty> original = impl->activityLoggingLogPreviousValueInterfaceAttribute(); |
| v8::Handle<v8::Value> originalValue = toV8(impl->activityLoggingLogPreviousValueInterfaceAttribute(), info.Holder(), info.GetIsolate()); |
| @@ -7643,7 +7659,8 @@ static void activityLoggingAccessForAllWorldsMethodMethod(const v8::FunctionCall |
| static void activityLoggingAccessForAllWorldsMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) |
| { |
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod"); |
| - V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext()); |
| + ScriptState* scriptState = ScriptState::from(info.GetIsolate()->GetCurrentContext()); |
| + V8PerContextData* contextData = scriptState->perContextData(); |
| if (contextData && contextData->activityLogger()) { |
| Vector<v8::Handle<v8::Value> > loggerArgs = toNativeArguments<v8::Handle<v8::Value> >(info, 0); |
| contextData->activityLogger()->logMethod("TestObject.activityLoggingAccessForAllWorldsMethod", info.Length(), loggerArgs.data()); |
| @@ -8415,7 +8432,8 @@ static void activityLoggingForAllWorldsPerWorldBindingsVoidMethodMethod(const v8 |
| static void activityLoggingForAllWorldsPerWorldBindingsVoidMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) |
| { |
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod"); |
| - V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext()); |
| + ScriptState* scriptState = ScriptState::from(info.GetIsolate()->GetCurrentContext()); |
| + V8PerContextData* contextData = scriptState->perContextData(); |
| if (contextData && contextData->activityLogger()) { |
| Vector<v8::Handle<v8::Value> > loggerArgs = toNativeArguments<v8::Handle<v8::Value> >(info, 0); |
| contextData->activityLogger()->logMethod("TestObject.activityLoggingForAllWorldsPerWorldBindingsVoidMethod", info.Length(), loggerArgs.data()); |
| @@ -8433,7 +8451,8 @@ static void activityLoggingForAllWorldsPerWorldBindingsVoidMethodMethodForMainWo |
| static void activityLoggingForAllWorldsPerWorldBindingsVoidMethodMethodCallbackForMainWorld(const v8::FunctionCallbackInfo<v8::Value>& info) |
| { |
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod"); |
| - V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext()); |
| + ScriptState* scriptState = ScriptState::from(info.GetIsolate()->GetCurrentContext()); |
| + V8PerContextData* contextData = scriptState->perContextData(); |
| if (contextData && contextData->activityLogger()) { |
| Vector<v8::Handle<v8::Value> > loggerArgs = toNativeArguments<v8::Handle<v8::Value> >(info, 0); |
| contextData->activityLogger()->logMethod("TestObject.activityLoggingForAllWorldsPerWorldBindingsVoidMethod", info.Length(), loggerArgs.data()); |
| @@ -8451,7 +8470,8 @@ static void activityLoggingForIsolatedWorldsPerWorldBindingsVoidMethodMethod(con |
| static void activityLoggingForIsolatedWorldsPerWorldBindingsVoidMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) |
| { |
| TRACE_EVENT_SET_SAMPLING_STATE("Blink", "DOMMethod"); |
| - V8PerContextData* contextData = V8PerContextData::from(info.GetIsolate()->GetCurrentContext()); |
| + ScriptState* scriptState = ScriptState::from(info.GetIsolate()->GetCurrentContext()); |
| + V8PerContextData* contextData = scriptState->perContextData(); |
| if (contextData && contextData->activityLogger()) { |
| Vector<v8::Handle<v8::Value> > loggerArgs = toNativeArguments<v8::Handle<v8::Value> >(info, 0); |
| contextData->activityLogger()->logMethod("TestObject.activityLoggingForIsolatedWorldsPerWorldBindingsVoidMethod", info.Length(), loggerArgs.data()); |