| Index: Source/bindings/core/v8/WindowProxy.cpp
|
| diff --git a/Source/bindings/core/v8/WindowProxy.cpp b/Source/bindings/core/v8/WindowProxy.cpp
|
| index 51aeff63cf0728403532e18d27da188ed233c1ca..43761438c3d48a99fbe66256be57a264e3b16c11 100644
|
| --- a/Source/bindings/core/v8/WindowProxy.cpp
|
| +++ b/Source/bindings/core/v8/WindowProxy.cpp
|
| @@ -455,15 +455,16 @@ static void getter(v8::Local<v8::Name> property, const v8::PropertyCallbackInfo<
|
| AtomicString name = toCoreAtomicString(property.As<v8::String>());
|
| HTMLDocument* htmlDocument = V8HTMLDocument::toImpl(info.Holder());
|
| ASSERT(htmlDocument);
|
| - v8::Handle<v8::Value> result = getNamedProperty(htmlDocument, name, info.Holder(), info.GetIsolate());
|
| + v8::Local<v8::Value> result = getNamedProperty(htmlDocument, name, info.Holder(), info.GetIsolate());
|
| if (!result.IsEmpty()) {
|
| v8SetReturnValue(info, result);
|
| return;
|
| }
|
| - v8::Handle<v8::Value> prototype = info.Holder()->GetPrototype();
|
| + v8::Local<v8::Value> prototype = info.Holder()->GetPrototype();
|
| if (prototype->IsObject()) {
|
| - v8SetReturnValue(info, prototype.As<v8::Object>()->Get(property));
|
| - return;
|
| + v8::Local<v8::Value> value;
|
| + if (prototype.As<v8::Object>()->Get(info.GetIsolate()->GetCurrentContext(), property).ToLocal(&value))
|
| + v8SetReturnValue(info, value);
|
| }
|
| }
|
|
|
|
|