Index: Source/web/WebRemoteFrameImpl.h |
diff --git a/Source/web/WebRemoteFrameImpl.h b/Source/web/WebRemoteFrameImpl.h |
index e680d5a00677545ec235eec8b79c03ad12d65b4e..859cb4e81a2f8cc86b1fca62a7b331648625d688 100644 |
--- a/Source/web/WebRemoteFrameImpl.h |
+++ b/Source/web/WebRemoteFrameImpl.h |
@@ -17,7 +17,7 @@ class FrameHost; |
class FrameOwner; |
class RemoteFrame; |
-class WebRemoteFrameImpl : public WebRemoteFrame, public RefCounted<WebRemoteFrameImpl> { |
+class WebRemoteFrameImpl FINAL : public RefCountedWillBeGarbageCollectedFinalized<WebRemoteFrameImpl>, public WebRemoteFrame { |
public: |
WebRemoteFrameImpl(); |
virtual ~WebRemoteFrameImpl(); |
@@ -178,16 +178,18 @@ public: |
void initializeCoreFrame(FrameHost*, FrameOwner*, const AtomicString& name); |
- void setCoreFrame(PassRefPtr<RemoteFrame>); |
+ void setCoreFrame(PassRefPtrWillBeRawPtr<RemoteFrame>); |
RemoteFrame* frame() const { return m_frame.get(); } |
static WebRemoteFrameImpl* fromFrame(RemoteFrame&); |
+ virtual void trace(Visitor*); |
+ |
private: |
RemoteFrameClient m_frameClient; |
- RefPtr<RemoteFrame> m_frame; |
+ RefPtrWillBeMember<RemoteFrame> m_frame; |
- HashMap<WebFrame*, OwnPtr<FrameOwner> > m_ownersForChildren; |
+ WillBeHeapHashMap<WebFrame*, OwnPtrWillBeMember<FrameOwner> > m_ownersForChildren; |
}; |
DEFINE_TYPE_CASTS(WebRemoteFrameImpl, WebFrame, frame, frame->isWebRemoteFrame(), frame.isWebRemoteFrame()); |