Index: third_party/WebKit/Source/core/frame/Frame.cpp |
diff --git a/third_party/WebKit/Source/core/frame/Frame.cpp b/third_party/WebKit/Source/core/frame/Frame.cpp |
index b5cbebbf8ee7043659c7507b44a361003e6eaaea..c2d06b83eef42b26be0bae5d5688f2969e0ea7b2 100644 |
--- a/third_party/WebKit/Source/core/frame/Frame.cpp |
+++ b/third_party/WebKit/Source/core/frame/Frame.cpp |
@@ -92,6 +92,10 @@ void Frame::detach(FrameDetachType type) |
{ |
ASSERT(m_client); |
m_client->setOpener(0); |
+ |
+ if (type == FrameDetachType::Swap && isMainFrame() && page()) |
dcheng
2015/11/19 05:09:56
I don't think page() can ever be null here. An inv
loyso (OOO)
2015/11/26 06:22:52
Acknowledged.
|
+ page()->willSwapMainFrame(); |
+ |
domWindow()->resetLocation(); |
disconnectOwnerElement(); |
// After this, we must no longer talk to the client since this clears |