| Index: Source/bindings/tests/results/V8TestException.cpp
|
| diff --git a/Source/bindings/tests/results/V8TestException.cpp b/Source/bindings/tests/results/V8TestException.cpp
|
| index 1c85430da8780ec5fab875fc6909e9c67b8b54e0..e152fdbdb6b861d29452d1d7b689df43d752821e 100644
|
| --- a/Source/bindings/tests/results/V8TestException.cpp
|
| +++ b/Source/bindings/tests/results/V8TestException.cpp
|
| @@ -118,7 +118,7 @@ static const V8DOMConfiguration::AttributeConfiguration V8TestExceptionAttribute
|
| {"readonlyStringAttribute", TestExceptionV8Internal::readonlyStringAttributeAttributeGetterCallback, 0, 0, 0, 0, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
|
| };
|
|
|
| -static void configureV8TestExceptionTemplate(v8::Handle<v8::FunctionTemplate> functionTemplate, v8::Isolate* isolate, WrapperWorldType currentWorldType)
|
| +static void configureV8TestExceptionTemplate(v8::Handle<v8::FunctionTemplate> functionTemplate, v8::Isolate* isolate)
|
| {
|
| functionTemplate->ReadOnlyPrototype();
|
|
|
| @@ -127,7 +127,7 @@ static void configureV8TestExceptionTemplate(v8::Handle<v8::FunctionTemplate> fu
|
| V8TestExceptionAttributes, WTF_ARRAY_LENGTH(V8TestExceptionAttributes),
|
| 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();
|
| static const V8DOMConfiguration::ConstantConfiguration V8TestExceptionConstants[] = {
|
| @@ -140,17 +140,17 @@ static void configureV8TestExceptionTemplate(v8::Handle<v8::FunctionTemplate> fu
|
| functionTemplate->Set(v8AtomicString(isolate, "toString"), V8PerIsolateData::current()->toStringTemplate());
|
| }
|
|
|
| -v8::Handle<v8::FunctionTemplate> V8TestException::domTemplate(v8::Isolate* isolate, WrapperWorldType currentWorldType)
|
| +v8::Handle<v8::FunctionTemplate> V8TestException::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);
|
| - configureV8TestExceptionTemplate(templ, isolate, currentWorldType);
|
| - data->templateMap(currentWorldType).add(&wrapperTypeInfo, UnsafePersistent<v8::FunctionTemplate>(isolate, templ));
|
| + configureV8TestExceptionTemplate(templ, isolate);
|
| + data->templateMap().add(&wrapperTypeInfo, UnsafePersistent<v8::FunctionTemplate>(isolate, templ));
|
| return templ;
|
| }
|
|
|
|
|