Index: Source/bindings/tests/results/V8TestObject.cpp |
diff --git a/Source/bindings/tests/results/V8TestObject.cpp b/Source/bindings/tests/results/V8TestObject.cpp |
index 924413d9f19331dad5d4049e6a7c541656148138..58621d5a00a6be19d0d3437beb05aedd8df34719 100644 |
--- a/Source/bindings/tests/results/V8TestObject.cpp |
+++ b/Source/bindings/tests/results/V8TestObject.cpp |
@@ -5511,22 +5511,22 @@ static const V8DOMConfiguration::MethodConfiguration V8TestObjectMethods[] = { |
{"deprecatedMethod", TestObjectV8Internal::deprecatedMethodMethodCallback, 0, 0}, |
}; |
-static void configureV8TestObjectTemplate(v8::Handle<v8::FunctionTemplate> functionTemplate, v8::Isolate* isolate, WrapperWorldType currentWorldType) |
+static void configureV8TestObjectTemplate(v8::Handle<v8::FunctionTemplate> functionTemplate, v8::Isolate* isolate) |
{ |
functionTemplate->ReadOnlyPrototype(); |
v8::Local<v8::Signature> defaultSignature; |
- defaultSignature = V8DOMConfiguration::installDOMClassTemplate(functionTemplate, "TestObject", V8EventTarget::domTemplate(isolate, currentWorldType), V8TestObject::internalFieldCount, |
+ defaultSignature = V8DOMConfiguration::installDOMClassTemplate(functionTemplate, "TestObject", V8EventTarget::domTemplate(isolate), V8TestObject::internalFieldCount, |
V8TestObjectAttributes, WTF_ARRAY_LENGTH(V8TestObjectAttributes), |
V8TestObjectAccessors, WTF_ARRAY_LENGTH(V8TestObjectAccessors), |
V8TestObjectMethods, WTF_ARRAY_LENGTH(V8TestObjectMethods), |
- isolate, currentWorldType); |
+ isolate); |
v8::Local<v8::ObjectTemplate> ALLOW_UNUSED instanceTemplate = functionTemplate->InstanceTemplate(); |
v8::Local<v8::ObjectTemplate> ALLOW_UNUSED prototypeTemplate = functionTemplate->PrototypeTemplate(); |
if (RuntimeEnabledFeatures::featureNameEnabled()) { |
static const V8DOMConfiguration::AttributeConfiguration attributeConfiguration =\ |
{"enabledAtRuntimeAttr", TestObjectV8Internal::enabledAtRuntimeAttrAttributeGetterCallback, TestObjectV8Internal::enabledAtRuntimeAttrAttributeSetterCallback, 0, 0, 0, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */}; |
- V8DOMConfiguration::installAttribute(instanceTemplate, prototypeTemplate, attributeConfiguration, isolate, currentWorldType); |
+ V8DOMConfiguration::installAttribute(instanceTemplate, prototypeTemplate, attributeConfiguration, isolate); |
} |
static const V8DOMConfiguration::ConstantConfiguration V8TestObjectConstants[] = { |
{"DEPRECATED_CONSTANT", 1}, |
@@ -5552,17 +5552,17 @@ static void configureV8TestObjectTemplate(v8::Handle<v8::FunctionTemplate> funct |
functionTemplate->Set(v8AtomicString(isolate, "toString"), V8PerIsolateData::current()->toStringTemplate()); |
} |
-v8::Handle<v8::FunctionTemplate> V8TestObject::domTemplate(v8::Isolate* isolate, WrapperWorldType currentWorldType) |
+v8::Handle<v8::FunctionTemplate> V8TestObject::domTemplate(v8::Isolate* isolate) |
{ |
V8PerIsolateData* data = V8PerIsolateData::from(isolate); |
- V8PerIsolateData::TemplateMap::iterator result = data->templateMap(currentWorldType).find(&wrapperTypeInfo); |
- if (result != data->templateMap(currentWorldType).end()) |
+ V8PerIsolateData::TemplateMap::iterator result = data->templateMap().find(&wrapperTypeInfo); |
+ if (result != data->templateMap().end()) |
return result->value.newLocal(isolate); |
TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "BuildDOMTemplate"); |
v8::Local<v8::FunctionTemplate> templ = v8::FunctionTemplate::New(isolate, V8ObjectConstructor::isValidConstructorMode); |
- configureV8TestObjectTemplate(templ, isolate, currentWorldType); |
- data->templateMap(currentWorldType).add(&wrapperTypeInfo, UnsafePersistent<v8::FunctionTemplate>(isolate, templ)); |
+ configureV8TestObjectTemplate(templ, isolate); |
+ data->templateMap().add(&wrapperTypeInfo, UnsafePersistent<v8::FunctionTemplate>(isolate, templ)); |
return templ; |
} |
@@ -5593,7 +5593,7 @@ void V8TestObject::installPerContextEnabledProperties(v8::Handle<v8::Object> ins |
void V8TestObject::installPerContextEnabledMethods(v8::Handle<v8::Object> prototypeTemplate, v8::Isolate* isolate) |
{ |
- v8::Local<v8::Signature> defaultSignature = v8::Signature::New(isolate, domTemplate(isolate, worldType(isolate))); |
+ v8::Local<v8::Signature> defaultSignature = v8::Signature::New(isolate, domTemplate(isolate)); |
ExecutionContext* context = toExecutionContext(prototypeTemplate->CreationContext()); |
if (context && context->isDocument() && ContextFeatures::featureNameEnabled(toDocument(context))) |