RemoteBridgeFrameOwner: keep better track of the attached frame

third_party/WebKit/Source/core/frame/RemoteFrame.cpp

Index: third_party/WebKit/Source/core/frame/RemoteFrame.cpp
diff --git a/third_party/WebKit/Source/core/frame/RemoteFrame.cpp b/third_party/WebKit/Source/core/frame/RemoteFrame.cpp
index 92d0d137150a5242d58597f9927c7b965f722796..5ac0489efb37b9b0c950ebf538df025eddbf9768 100644
--- a/third_party/WebKit/Source/core/frame/RemoteFrame.cpp
+++ b/third_party/WebKit/Source/core/frame/RemoteFrame.cpp
@@ -104,6 +104,8 @@ void RemoteFrame::detach(FrameDetachType type)
     client()->willBeDetached();
     m_windowProxyManager->clearForClose();
     setView(nullptr);
+    if (m_remotePlatformLayer)
+        setRemotePlatformLayer(nullptr);
     Frame::detach(type);
 }
 
@@ -118,16 +120,6 @@ RemoteSecurityContext* RemoteFrame::securityContext() const
     return m_securityContext.get();
 }
 
-void RemoteFrame::disconnectOwnerElement()
-{
-    // The RemotePlatformLayer needs to be cleared in disconnectOwnerElement()
-    // because it must happen on WebFrame::swap() and Frame::detach().
-    if (m_remotePlatformLayer)
-        setRemotePlatformLayer(nullptr);
-
-    Frame::disconnectOwnerElement();
-}
-
 bool RemoteFrame::shouldClose()
 {
     // TODO(nasko): Implement running the beforeunload handler in the actual