Rewrite how RemoteFrameOwners retain life.

third_party/WebKit/Source/web/WebRemoteFrameImpl.h

 // 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.
 
 #ifndef WebRemoteFrameImpl_h
 #define WebRemoteFrameImpl_h
 
-#include "core/frame/FrameOwner.h"
 #include "core/frame/RemoteFrame.h"
 #include "public/web/WebRemoteFrame.h"
 #include "public/web/WebRemoteFrameClient.h"
 #include "web/RemoteFrameClientImpl.h"
 #include "web/WebExport.h"
 #include "web/WebFrameImplBase.h"
 #include "wtf/Compiler.h"
-#include "wtf/HashMap.h"
 #include "wtf/OwnPtr.h"
-#include "wtf/RefCounted.h"
 
 namespace blink {
 
 class FrameHost;
 class FrameOwner;
 class RemoteFrame;
 
 class WEB_EXPORT WebRemoteFrameImpl final : public WebFrameImplBase, WTF_NON_EXPORTED_BASE(public WebRemoteFrame) {
 public:
     static WebRemoteFrameImpl* create(WebTreeScopeType, WebRemoteFrameClient*, WebFrame* opener);
     ~WebRemoteFrameImpl() override;
 
     // WebFrame methods:
     void close() override;
     WebString uniqueName() const override;
     WebString assignedName() const override;
     void setName(const WebString&) override;
     WebVector<WebIconURL> iconURLs(int iconTypesMask) const override;
     void setRemoteWebLayer(WebLayer*) override;
     void setSharedWorkerRepositoryClient(WebSharedWorkerRepositoryClient*) override;
     void setCanHaveScrollbars(bool) override;
     WebSize scrollOffset() const override;
     void setScrollOffset(const WebSize&) override;
     WebSize contentsSize() const override;
     bool hasVisibleContent() const override;
     WebRect visibleContentRect() const override;
     bool hasHorizontalScrollbar() const override;
     bool hasVerticalScrollbar() const override;
     WebView* view() const override;
-    void removeChild(WebFrame*) override;
     WebDocument document() const override;
     WebPerformance performance() const override;
     bool dispatchBeforeUnloadEvent() override;
     void dispatchUnloadEvent() override;
     NPObject* windowObject() const override;
     void bindToWindowObject(const WebString& name, NPObject*) override;
     void bindToWindowObject(const WebString& name, NPObject*, void*) override;
     void executeScript(const WebScriptSource&) override;
     void executeScriptInIsolatedWorld(
         int worldID, const WebScriptSource* sources, unsigned numSources,
@@ skipping 122 matching lines @@
     // to call these on a WebRemoteFrameImpl.
     bool isWebLocalFrame() const override;
     WebLocalFrame* toWebLocalFrame() override;
     bool isWebRemoteFrame() const override;
     WebRemoteFrame* toWebRemoteFrame() override;
 
     OwnPtrWillBeMember<RemoteFrameClientImpl> m_frameClient;
     RefPtrWillBeMember<RemoteFrame> m_frame;
     WebRemoteFrameClient* m_client;
 
-    WillBeHeapHashMap<WebFrame*, OwnPtrWillBeMember<FrameOwner>> m_ownersForChildren;
-
 #if ENABLE(OILPAN)
     // Oilpan: WebRemoteFrameImpl must remain alive until close() is called.
     // Accomplish that by keeping a self-referential Persistent<>. It is
     // cleared upon close().
     SelfKeepAlive<WebRemoteFrameImpl> m_selfKeepAlive;
 #endif
 };
 
 DEFINE_TYPE_CASTS(WebRemoteFrameImpl, WebFrame, frame, frame->isWebRemoteFrame(), frame.isWebRemoteFrame());
 
 } // namespace blink
 
 #endif // WebRemoteFrameImpl_h