Rewrite how RemoteFrameOwners retain life.

third_party/WebKit/Source/web/WebFrame.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 "public/web/WebFrame.h"
 
 #include "bindings/core/v8/WindowProxyManager.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/RemoteFrame.h"
 #include "core/html/HTMLFrameElementBase.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/page/Page.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/heap/Handle.h"
 #include "public/web/WebElement.h"
 #include "public/web/WebFrameOwnerProperties.h"
 #include "public/web/WebSandboxFlags.h"
 #include "web/OpenedFrameTracker.h"
-#include "web/RemoteBridgeFrameOwner.h"
+#include "web/RemoteFrameOwner.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebRemoteFrameImpl.h"
 #include <algorithm>
 
 namespace blink {
 
 bool WebFrame::swap(WebFrame* frame)
 {
     using std::swap;
     RefPtrWillBeRawPtr<Frame> oldFrame = toImplBase()->frame();
@@ skipping 33 matching lines @@
     if (m_opener) {
         frame->setOpener(m_opener);
         setOpener(nullptr);
     }
     m_openedFrameTracker->transferTo(frame);
 
     FrameHost* host = oldFrame->host();
     AtomicString name = oldFrame->tree().name();
     AtomicString uniqueName = oldFrame->tree().uniqueName();
     FrameOwner* owner = oldFrame->owner();
+#if !ENABLE(OILPAN)
+    // Persistence of a remote frame owner is complicated in the pre-Oilpan
+    // world. Please see RemoteFrameOwner::setContentFrame() for the details.
+    RefPtr<RemoteFrameOwner> remoteOwnerProtector;
+    if (owner && owner->isRemote())
+        remoteOwnerProtector = toRemoteFrameOwner(owner);
+#endif
 
     v8::HandleScope handleScope(v8::Isolate::GetCurrent());
     HashMap<DOMWrapperWorld*, v8::Local<v8::Object>> globals;
     oldFrame->getWindowProxyManager()->clearForNavigation();
     oldFrame->getWindowProxyManager()->releaseGlobals(globals);
 
     // Although the Document in this frame is now unloaded, many resources
     // associated with the frame itself have not yet been freed yet.
     oldFrame->detach(FrameDetachType::Swap);
 
@@ skipping 37 matching lines @@
     return WebSecurityOrigin(toImplBase()->frame()->securityContext()->getSecurityOrigin());
 }
 
 
 void WebFrame::setFrameOwnerSandboxFlags(WebSandboxFlags flags)
 {
     // At the moment, this is only used to replicate sandbox flags
     // for frames with a remote owner.
     FrameOwner* owner = toImplBase()->frame()->owner();
     ASSERT(owner);
-    toRemoteBridgeFrameOwner(owner)->setSandboxFlags(static_cast<SandboxFlags>(flags));
+    toRemoteFrameOwner(owner)->setSandboxFlags(static_cast<SandboxFlags>(flags));
 }
 
 bool WebFrame::shouldEnforceStrictMixedContentChecking() const
 {
     return toImplBase()->frame()->securityContext()->shouldEnforceStrictMixedContentChecking();
 }
 
 WebFrame* WebFrame::opener() const
 {
     return m_opener;
@@ skipping 214 matching lines @@
     void WebFrame::traceFrames(VisitorDispatcher visitor, WebFrame* frame) { traceFramesImpl(visitor, frame); }                \
     void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { clearWeakFramesImpl(visitor); }
 
 DEFINE_VISITOR_METHOD(Visitor*)
 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor)
 
 #undef DEFINE_VISITOR_METHOD
 #endif
 
 } // namespace blink