| Index: Source/bindings/tests/results/V8TestInterfaceNamedConstructor.cpp
|
| diff --git a/Source/bindings/tests/results/V8TestInterfaceNamedConstructor.cpp b/Source/bindings/tests/results/V8TestInterfaceNamedConstructor.cpp
|
| index 42f13c4b6c014276a4453baa819011a067f6b60f..cd9e521b3fa1a35428fb4429bc828eddfb424ee2 100644
|
| --- a/Source/bindings/tests/results/V8TestInterfaceNamedConstructor.cpp
|
| +++ b/Source/bindings/tests/results/V8TestInterfaceNamedConstructor.cpp
|
| @@ -139,11 +139,11 @@ static void V8TestInterfaceNamedConstructorConstructorCallback(const v8::Functio
|
| v8SetReturnValue(info, wrapper);
|
| }
|
|
|
| -v8::Handle<v8::FunctionTemplate> V8TestInterfaceNamedConstructorConstructor::domTemplate(v8::Isolate* isolate, WrapperWorldType currentWorldType)
|
| +v8::Handle<v8::FunctionTemplate> V8TestInterfaceNamedConstructorConstructor::domTemplate(v8::Isolate* isolate)
|
| {
|
| static int domTemplateKey; // This address is used for a key to look up the dom template.
|
| V8PerIsolateData* data = V8PerIsolateData::from(isolate);
|
| - v8::Local<v8::FunctionTemplate> result = data->existingDOMTemplate(currentWorldType, &domTemplateKey);
|
| + v8::Local<v8::FunctionTemplate> result = data->existingDOMTemplate(&domTemplateKey);
|
| if (!result.IsEmpty())
|
| return result;
|
|
|
| @@ -154,13 +154,12 @@ v8::Handle<v8::FunctionTemplate> V8TestInterfaceNamedConstructorConstructor::dom
|
| v8::Local<v8::ObjectTemplate> instanceTemplate = result->InstanceTemplate();
|
| instanceTemplate->SetInternalFieldCount(V8TestInterfaceNamedConstructor::internalFieldCount);
|
| result->SetClassName(v8AtomicString(isolate, "TestInterfaceNamedConstructor"));
|
| - result->Inherit(V8TestInterfaceNamedConstructor::domTemplate(isolate, currentWorldType));
|
| - data->setDOMTemplate(currentWorldType, &domTemplateKey, result);
|
| -
|
| + result->Inherit(V8TestInterfaceNamedConstructor::domTemplate(isolate));
|
| + data->setDOMTemplate(&domTemplateKey, result);
|
| return scope.Escape(result);
|
| }
|
|
|
| -static void configureV8TestInterfaceNamedConstructorTemplate(v8::Handle<v8::FunctionTemplate> functionTemplate, v8::Isolate* isolate, WrapperWorldType currentWorldType)
|
| +static void configureV8TestInterfaceNamedConstructorTemplate(v8::Handle<v8::FunctionTemplate> functionTemplate, v8::Isolate* isolate)
|
| {
|
| functionTemplate->ReadOnlyPrototype();
|
|
|
| @@ -169,7 +168,7 @@ static void configureV8TestInterfaceNamedConstructorTemplate(v8::Handle<v8::Func
|
| V8TestInterfaceNamedConstructorAttributes, WTF_ARRAY_LENGTH(V8TestInterfaceNamedConstructorAttributes),
|
| 0, 0,
|
| 0, 0,
|
| - isolate, currentWorldType);
|
| + isolate);
|
| v8::Local<v8::ObjectTemplate> ALLOW_UNUSED instanceTemplate = functionTemplate->InstanceTemplate();
|
| v8::Local<v8::ObjectTemplate> ALLOW_UNUSED prototypeTemplate = functionTemplate->PrototypeTemplate();
|
|
|
| @@ -177,17 +176,17 @@ static void configureV8TestInterfaceNamedConstructorTemplate(v8::Handle<v8::Func
|
| functionTemplate->Set(v8AtomicString(isolate, "toString"), V8PerIsolateData::current()->toStringTemplate());
|
| }
|
|
|
| -v8::Handle<v8::FunctionTemplate> V8TestInterfaceNamedConstructor::domTemplate(v8::Isolate* isolate, WrapperWorldType currentWorldType)
|
| +v8::Handle<v8::FunctionTemplate> V8TestInterfaceNamedConstructor::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);
|
| - configureV8TestInterfaceNamedConstructorTemplate(templ, isolate, currentWorldType);
|
| - data->templateMap(currentWorldType).add(&wrapperTypeInfo, UnsafePersistent<v8::FunctionTemplate>(isolate, templ));
|
| + configureV8TestInterfaceNamedConstructorTemplate(templ, isolate);
|
| + data->templateMap().add(&wrapperTypeInfo, UnsafePersistent<v8::FunctionTemplate>(isolate, templ));
|
| return templ;
|
| }
|
|
|
|
|