| Index: Source/bindings/tests/results/V8TestConditionalInterface.cpp
|
| diff --git a/Source/bindings/tests/results/V8TestConditionalInterface.cpp b/Source/bindings/tests/results/V8TestConditionalInterface.cpp
|
| index 101aa795f1d8ab9b0fbc3c10eb9969ac25c56e6f..17dd3962ae3c75b3437570e8444a0e20015e98e2 100644
|
| --- a/Source/bindings/tests/results/V8TestConditionalInterface.cpp
|
| +++ b/Source/bindings/tests/results/V8TestConditionalInterface.cpp
|
| @@ -91,7 +91,7 @@ static v8::Handle<v8::FunctionTemplate> ConfigureV8TestConditionalInterfaceTempl
|
| UNUSED_PARAM(prototypeTemplate);
|
|
|
| // Custom toString template
|
| - functionTemplate->Set(v8::String::NewSymbol("toString"), V8PerIsolateData::current()->toStringTemplate());
|
| + functionTemplate->Set(v8::String::NewFromUtf8(isolate, "toString", v8::String::kInternalizedString), V8PerIsolateData::current()->toStringTemplate());
|
| return functionTemplate;
|
| }
|
|
|
| @@ -103,11 +103,11 @@ v8::Handle<v8::FunctionTemplate> V8TestConditionalInterface::GetTemplate(v8::Iso
|
| return result->value.newLocal(isolate);
|
|
|
| TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "BuildDOMTemplate");
|
| - v8::HandleScope handleScope(isolate);
|
| - v8::Handle<v8::FunctionTemplate> templ =
|
| + v8::EscapableHandleScope handleScope(isolate);
|
| + v8::Local<v8::FunctionTemplate> templ =
|
| ConfigureV8TestConditionalInterfaceTemplate(data->rawTemplate(&wrapperTypeInfo, currentWorldType), isolate, currentWorldType);
|
| data->templateMap(currentWorldType).add(&wrapperTypeInfo, UnsafePersistent<v8::FunctionTemplate>(isolate, templ));
|
| - return handleScope.Close(templ);
|
| + return handleScope.Escape(templ);
|
| }
|
|
|
| bool V8TestConditionalInterface::hasInstance(v8::Handle<v8::Value> jsValue, v8::Isolate* isolate, WrapperWorldType currentWorldType)
|
|
|