| Index: Source/bindings/v8/V8WindowShell.cpp
|
| diff --git a/Source/bindings/v8/V8WindowShell.cpp b/Source/bindings/v8/V8WindowShell.cpp
|
| index 053222dae02bcc99f9725af9b4ec89f83ca4c0f5..7a502d01c86203e8eac978819b59600a783bdc88 100644
|
| --- a/Source/bindings/v8/V8WindowShell.cpp
|
| +++ b/Source/bindings/v8/V8WindowShell.cpp
|
| @@ -304,13 +304,13 @@ bool V8WindowShell::installDOMWindow()
|
| {
|
| DOMWrapperWorld::setInitializingWindow(true);
|
| DOMWindow* window = m_frame->domWindow();
|
| - v8::Local<v8::Object> windowWrapper = V8ObjectConstructor::newInstance(V8PerContextData::from(m_context.newLocal(m_isolate))->constructorForType(&V8Window::info));
|
| + v8::Local<v8::Object> windowWrapper = V8ObjectConstructor::newInstance(V8PerContextData::from(m_context.newLocal(m_isolate))->constructorForType(&V8Window::wrapperTypeInfo));
|
| if (windowWrapper.IsEmpty())
|
| return false;
|
|
|
| V8Window::installPerContextEnabledProperties(windowWrapper, window, m_isolate);
|
|
|
| - V8DOMWrapper::setNativeInfo(v8::Handle<v8::Object>::Cast(windowWrapper->GetPrototype()), &V8Window::info, window);
|
| + V8DOMWrapper::setNativeInfo(v8::Handle<v8::Object>::Cast(windowWrapper->GetPrototype()), &V8Window::wrapperTypeInfo, window);
|
|
|
| // Install the windowWrapper as the prototype of the innerGlobalObject.
|
| // The full structure of the global object is as follows:
|
| @@ -326,9 +326,9 @@ bool V8WindowShell::installDOMWindow()
|
| // JavaScript object.
|
| //
|
| v8::Handle<v8::Object> innerGlobalObject = toInnerGlobalObject(m_context.newLocal(m_isolate));
|
| - V8DOMWrapper::setNativeInfo(innerGlobalObject, &V8Window::info, window);
|
| + V8DOMWrapper::setNativeInfo(innerGlobalObject, &V8Window::wrapperTypeInfo, window);
|
| innerGlobalObject->SetPrototype(windowWrapper);
|
| - V8DOMWrapper::associateObjectWithWrapper<V8Window>(PassRefPtr<DOMWindow>(window), &V8Window::info, windowWrapper, m_isolate, WrapperConfiguration::Dependent);
|
| + V8DOMWrapper::associateObjectWithWrapper<V8Window>(PassRefPtr<DOMWindow>(window), &V8Window::wrapperTypeInfo, windowWrapper, m_isolate, WrapperConfiguration::Dependent);
|
| DOMWrapperWorld::setInitializingWindow(false);
|
| return true;
|
| }
|
|
|