Index: Source/bindings/tests/results/V8TestInterfaceCheckSecurity.cpp |
diff --git a/Source/bindings/tests/results/V8TestInterfaceCheckSecurity.cpp b/Source/bindings/tests/results/V8TestInterfaceCheckSecurity.cpp |
index e94be097e10f7d7ff81738075d8742f3f579b9b6..5014a34f4835ed36c2cbbcdd9966f1a416c9a828 100644 |
--- a/Source/bindings/tests/results/V8TestInterfaceCheckSecurity.cpp |
+++ b/Source/bindings/tests/results/V8TestInterfaceCheckSecurity.cpp |
@@ -398,57 +398,6 @@ static void doNotCheckSecurityPerWorldBindingsVoidMethodOriginSafeMethodGetterCa |
TRACE_EVENT_SET_SAMPLING_STATE("v8", "V8Execution"); |
} |
-static void doNotCheckSecurityReadOnlyVoidMethodMethod(const v8::FunctionCallbackInfo<v8::Value>& info) |
-{ |
- TestInterfaceCheckSecurity* impl = V8TestInterfaceCheckSecurity::toNative(info.Holder()); |
- impl->doNotCheckSecurityReadOnlyVoidMethod(); |
-} |
- |
-static void doNotCheckSecurityReadOnlyVoidMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) |
-{ |
- TRACE_EVENT_SET_SAMPLING_STATE("blink", "DOMMethod"); |
- TestInterfaceCheckSecurityV8Internal::doNotCheckSecurityReadOnlyVoidMethodMethod(info); |
- TRACE_EVENT_SET_SAMPLING_STATE("v8", "V8Execution"); |
-} |
- |
-static void doNotCheckSecurityReadOnlyVoidMethodOriginSafeMethodGetter(const v8::PropertyCallbackInfo<v8::Value>& info) |
-{ |
- v8::Isolate* isolate = info.GetIsolate(); |
- static int domTemplateKey; // This address is used for a key to look up the dom template. |
- V8PerIsolateData* data = V8PerIsolateData::from(isolate); |
- v8::Handle<v8::FunctionTemplate> privateTemplate = data->domTemplate(&domTemplateKey, TestInterfaceCheckSecurityV8Internal::doNotCheckSecurityReadOnlyVoidMethodMethodCallback, v8Undefined(), v8::Signature::New(isolate, V8TestInterfaceCheckSecurity::domTemplate(isolate)), 0); |
- |
- v8::Handle<v8::Object> holder = V8TestInterfaceCheckSecurity::findInstanceInPrototypeChain(info.This(), isolate); |
- if (holder.IsEmpty()) { |
- // This is only reachable via |object.__proto__.func|, in which case it |
- // has already passed the same origin security check |
- v8SetReturnValue(info, privateTemplate->GetFunction()); |
- return; |
- } |
- TestInterfaceCheckSecurity* impl = V8TestInterfaceCheckSecurity::toNative(holder); |
- if (!BindingSecurity::shouldAllowAccessToFrame(isolate, impl->frame(), DoNotReportSecurityError)) { |
- static int sharedTemplateKey; // This address is used for a key to look up the dom template. |
- v8::Handle<v8::FunctionTemplate> sharedTemplate = data->domTemplate(&sharedTemplateKey, TestInterfaceCheckSecurityV8Internal::doNotCheckSecurityReadOnlyVoidMethodMethodCallback, v8Undefined(), v8::Signature::New(isolate, V8TestInterfaceCheckSecurity::domTemplate(isolate)), 0); |
- v8SetReturnValue(info, sharedTemplate->GetFunction()); |
- return; |
- } |
- |
- v8::Local<v8::Value> hiddenValue = v8::Handle<v8::Object>::Cast(info.This())->GetHiddenValue(v8AtomicString(isolate, "doNotCheckSecurityReadOnlyVoidMethod")); |
- if (!hiddenValue.IsEmpty()) { |
- v8SetReturnValue(info, hiddenValue); |
- return; |
- } |
- |
- v8SetReturnValue(info, privateTemplate->GetFunction()); |
-} |
- |
-static void doNotCheckSecurityReadOnlyVoidMethodOriginSafeMethodGetterCallback(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8::Value>& info) |
-{ |
- TRACE_EVENT_SET_SAMPLING_STATE("blink", "DOMGetter"); |
- TestInterfaceCheckSecurityV8Internal::doNotCheckSecurityReadOnlyVoidMethodOriginSafeMethodGetter(info); |
- TRACE_EVENT_SET_SAMPLING_STATE("v8", "V8Execution"); |
-} |
- |
static void doNotCheckSecurityUnforgeableVoidMethodMethod(const v8::FunctionCallbackInfo<v8::Value>& info) |
{ |
TestInterfaceCheckSecurity* impl = V8TestInterfaceCheckSecurity::toNative(info.Holder()); |
@@ -563,12 +512,8 @@ static void configureV8TestInterfaceCheckSecurityTemplate(v8::Handle<v8::Functio |
"doNotCheckSecurityPerWorldBindingsVoidMethod", TestInterfaceCheckSecurityV8Internal::doNotCheckSecurityPerWorldBindingsVoidMethodOriginSafeMethodGetterCallback, TestInterfaceCheckSecurityV8Internal::TestInterfaceCheckSecurityOriginSafeMethodSetterCallback, TestInterfaceCheckSecurityV8Internal::doNotCheckSecurityPerWorldBindingsVoidMethodOriginSafeMethodGetterCallbackForMainWorld, TestInterfaceCheckSecurityV8Internal::TestInterfaceCheckSecurityOriginSafeMethodSetterCallbackForMainWorld, &V8TestInterfaceCheckSecurity::wrapperTypeInfo, v8::ALL_CAN_READ, static_cast<v8::PropertyAttribute>(v8::DontDelete), false |
}; |
V8DOMConfiguration::installAttribute(prototypeTemplate, v8::Handle<v8::ObjectTemplate>(), doNotCheckSecurityPerWorldBindingsVoidMethodOriginSafeAttributeConfiguration, isolate); |
- static const V8DOMConfiguration::AttributeConfiguration doNotCheckSecurityReadOnlyVoidMethodOriginSafeAttributeConfiguration = { |
- "doNotCheckSecurityReadOnlyVoidMethod", TestInterfaceCheckSecurityV8Internal::doNotCheckSecurityReadOnlyVoidMethodOriginSafeMethodGetterCallback, 0, 0, 0, &V8TestInterfaceCheckSecurity::wrapperTypeInfo, v8::ALL_CAN_READ, static_cast<v8::PropertyAttribute>(v8::DontDelete | v8::ReadOnly), false |
- }; |
- V8DOMConfiguration::installAttribute(prototypeTemplate, v8::Handle<v8::ObjectTemplate>(), doNotCheckSecurityReadOnlyVoidMethodOriginSafeAttributeConfiguration, isolate); |
static const V8DOMConfiguration::AttributeConfiguration doNotCheckSecurityUnforgeableVoidMethodOriginSafeAttributeConfiguration = { |
- "doNotCheckSecurityUnforgeableVoidMethod", TestInterfaceCheckSecurityV8Internal::doNotCheckSecurityUnforgeableVoidMethodOriginSafeMethodGetterCallback, TestInterfaceCheckSecurityV8Internal::TestInterfaceCheckSecurityOriginSafeMethodSetterCallback, 0, 0, &V8TestInterfaceCheckSecurity::wrapperTypeInfo, v8::ALL_CAN_READ, static_cast<v8::PropertyAttribute>(v8::DontDelete), false |
+ "doNotCheckSecurityUnforgeableVoidMethod", TestInterfaceCheckSecurityV8Internal::doNotCheckSecurityUnforgeableVoidMethodOriginSafeMethodGetterCallback, 0, 0, 0, &V8TestInterfaceCheckSecurity::wrapperTypeInfo, v8::ALL_CAN_READ, static_cast<v8::PropertyAttribute>(v8::DontDelete | v8::ReadOnly), false |
}; |
V8DOMConfiguration::installAttribute(instanceTemplate, v8::Handle<v8::ObjectTemplate>(), doNotCheckSecurityUnforgeableVoidMethodOriginSafeAttributeConfiguration, isolate); |