| Index: third_party/WebKit/Source/bindings/templates/interface_base.cpp.tmpl
|
| diff --git a/third_party/WebKit/Source/bindings/templates/interface_base.cpp.tmpl b/third_party/WebKit/Source/bindings/templates/interface_base.cpp.tmpl
|
| index 16bb616edd9650a10e3230642c7b258e75331c56..b710484cb5c435e5d447f02812d6df6412a3d3ab 100644
|
| --- a/third_party/WebKit/Source/bindings/templates/interface_base.cpp.tmpl
|
| +++ b/third_party/WebKit/Source/bindings/templates/interface_base.cpp.tmpl
|
| @@ -218,7 +218,7 @@ static const struct {
|
| {% for attribute in attributes if attribute.has_cross_origin_getter or attribute.has_cross_origin_setter %}
|
| {
|
| "{{attribute.name}}",
|
| - {%+ if attribute.has_cross_origin_getter %}&{{cpp_class}}V8Internal::{{attribute.name}}AttributeGetter{% else %}nullptr{% endif %},
|
| + {%+ if attribute.has_cross_origin_getter %}&{{cpp_class}}V8Internal::{{attribute.name}}CrossOriginAttributeGetter{% else %}nullptr{% endif %},
|
| {%+ if attribute.has_cross_origin_setter %}&{{cpp_class}}V8Internal::{{attribute.name}}AttributeSetter{% else %}nullptr{% endif %},
|
| },
|
| {% endfor %}
|
| @@ -287,7 +287,8 @@ static const struct {
|
|
|
| v8SetReturnValue(
|
| info,
|
| - ToV8(names, info.Holder(), info.GetIsolate()).As<v8::Array>());
|
| + ToV8(names, info.GetIsolate()->GetCurrentContext()->Global(),
|
| + info.GetIsolate()).As<v8::Array>());
|
| }
|
| {% endif %}
|
|
|
|
|