Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(741)

Side by Side Diff: Source/core/frame/LocalFrame.h

Issue 618253002: Revert of Streamline frame detach (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/FrameHost.cpp ('k') | Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999-2001 Lars Knoll <knoll@kde.org> 3 * 1999-2001 Lars Knoll <knoll@kde.org>
4 * 1999-2001 Antti Koivisto <koivisto@kde.org> 4 * 1999-2001 Antti Koivisto <koivisto@kde.org>
5 * 2000-2001 Simon Hausmann <hausmann@kde.org> 5 * 2000-2001 Simon Hausmann <hausmann@kde.org>
6 * 2000-2001 Dirk Mueller <mueller@kde.org> 6 * 2000-2001 Dirk Mueller <mueller@kde.org>
7 * 2000 Stefan Schimanski <1Stein@gmx.de> 7 * 2000 Stefan Schimanski <1Stein@gmx.de>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
9 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 10 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 virtual ~LocalFrame(); 78 virtual ~LocalFrame();
79 virtual void trace(Visitor*) OVERRIDE; 79 virtual void trace(Visitor*) OVERRIDE;
80 80
81 virtual void navigate(Document& originDocument, const KURL&, const Refer rer&, bool lockBackForwardList) OVERRIDE; 81 virtual void navigate(Document& originDocument, const KURL&, const Refer rer&, bool lockBackForwardList) OVERRIDE;
82 virtual void detach() OVERRIDE; 82 virtual void detach() OVERRIDE;
83 83
84 void addDestructionObserver(FrameDestructionObserver*); 84 void addDestructionObserver(FrameDestructionObserver*);
85 void removeDestructionObserver(FrameDestructionObserver*); 85 void removeDestructionObserver(FrameDestructionObserver*);
86 86
87 void willDetachFrameHost(); 87 void willDetachFrameHost();
88 void detachFromFrameHost();
88 89
89 virtual void disconnectOwnerElement() OVERRIDE; 90 virtual void disconnectOwnerElement() OVERRIDE;
90 91
91 virtual void setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow>) OVERRI DE; 92 virtual void setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow>) OVERRI DE;
92 FrameView* view() const; 93 FrameView* view() const;
93 Document* document() const; 94 Document* document() const;
94 void setPagePopupOwner(Element&); 95 void setPagePopupOwner(Element&);
95 Element* pagePopupOwner() const { return m_pagePopupOwner.get(); } 96 Element* pagePopupOwner() const { return m_pagePopupOwner.get(); }
96 97
97 RenderView* contentRenderer() const; // Root of the render tree for the document contained in this frame. 98 RenderView* contentRenderer() const; // Root of the render tree for the document contained in this frame.
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, localFrame->isLocalFrame(), localFrame.isLocalFrame()); 256 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, localFrame->isLocalFrame(), localFrame.isLocalFrame());
256 257
257 } // namespace blink 258 } // namespace blink
258 259
259 // During refactoring, there are some places where we need to do type conversion s that 260 // During refactoring, there are some places where we need to do type conversion s that
260 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte d out. 261 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte d out.
261 // At that time this #define will be removed and all the uses of it will need to be corrected. 262 // At that time this #define will be removed and all the uses of it will need to be corrected.
262 #define toLocalFrameTemporary toLocalFrame 263 #define toLocalFrameTemporary toLocalFrame
263 264
264 #endif // LocalFrame_h 265 #endif // LocalFrame_h
OLDNEW
« no previous file with comments | « Source/core/frame/FrameHost.cpp ('k') | Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698