Index: Source/core/frame/RemoteFrame.cpp |
diff --git a/Source/core/frame/RemoteFrame.cpp b/Source/core/frame/RemoteFrame.cpp |
index 7b07fdca6504eb37b51d917e4a7b90034cf19509..46385282a2ac025c7c1d7cb75480b3134b14fa7c 100644 |
--- a/Source/core/frame/RemoteFrame.cpp |
+++ b/Source/core/frame/RemoteFrame.cpp |
@@ -5,6 +5,7 @@ |
#include "config.h" |
#include "core/frame/RemoteFrame.h" |
+#include "bindings/core/v8/WindowProxy.h" |
#include "bindings/core/v8/WindowProxyManager.h" |
#include "core/dom/RemoteSecurityContext.h" |
#include "core/frame/RemoteDOMWindow.h" |
@@ -48,7 +49,10 @@ DOMWindow* RemoteFrame::domWindow() const |
WindowProxy* RemoteFrame::windowProxy(DOMWrapperWorld& world) |
{ |
- return m_windowProxyManager->windowProxy(world); |
+ WindowProxy* windowProxy = m_windowProxyManager->windowProxy(world); |
+ if (windowProxy) |
haraken
2015/02/03 00:56:09
I don't think windowProxy can be null. Shall we ch
Nate Chapin
2015/02/03 19:17:21
Yeah, I'd rather not mix that refactor with this C
|
+ windowProxy->initializeIfNeeded(); |
+ return windowProxy; |
} |
void RemoteFrame::navigate(Document& originDocument, const KURL& url, bool lockBackForwardList) |