RemoteBridgeFrameOwner: keep better track of the attached frame

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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/LocalFrame.h"
@@ skipping 86 matching lines @@
     if (!client())
         return;
 
     // Clean up the frame's view if needed. A remote frame only has a view if
     // the parent is a local frame.
     if (m_view)
         m_view->dispose();
     client()->willBeDetached();
     m_windowProxyManager->clearForClose();
     setView(nullptr);
+    if (m_remotePlatformLayer)
+        setRemotePlatformLayer(nullptr);
     Frame::detach(type);
 }
 
 bool RemoteFrame::prepareForCommit()
 {
     detachChildren();
     return !!host();
 }
 
 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
     // LocalFrame running in a different process and getting back a real result.
     return true;
 }
 
 void RemoteFrame::forwardInputEvent(Event* event)
 {
     remoteFrameClient()->forwardInputEvent(event);
@@ skipping 56 matching lines @@
     ASSERT(owner());
     toHTMLFrameOwnerElement(owner())->setNeedsCompositingUpdate();
 }
 
 void RemoteFrame::advanceFocus(WebFocusType type, LocalFrame* source)
 {
     remoteFrameClient()->advanceFocus(type, source);
 }
 
 } // namespace blink