| Index: Source/core/frame/DOMWindowProperty.cpp
|
| diff --git a/Source/core/frame/DOMWindowProperty.cpp b/Source/core/frame/DOMWindowProperty.cpp
|
| index e4664f3a25a7eba380a7200a94abf4add7c0a4e2..20b458d6718938b85f05eb6c9823ef8d36b2469b 100644
|
| --- a/Source/core/frame/DOMWindowProperty.cpp
|
| +++ b/Source/core/frame/DOMWindowProperty.cpp
|
| @@ -42,10 +42,12 @@ DOMWindowProperty::DOMWindowProperty(LocalFrame* frame)
|
| // See fast/dom/navigator-detached-no-crash.html for the recipe.
|
| // We should fix that. <rdar://problem/11567132>
|
| if (m_frame) {
|
| + // FIXME: Need to figure out what to do with DOMWindowProperties on
|
| + // remote DOM windows.
|
| #if ENABLE(OILPAN)
|
| - m_frame->domWindow()->registerProperty(this);
|
| + m_frame->localDOMWindow()->registerProperty(this);
|
| #else
|
| - m_associatedDOMWindow = m_frame->domWindow();
|
| + m_associatedDOMWindow = m_frame->localDOMWindow();
|
| m_associatedDOMWindow->registerProperty(this);
|
| #endif
|
| }
|
|
|