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

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

Issue 419863004: Refactor frame detach to work for both local and remote frames. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix comment typo Created 6 years, 4 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/Frame.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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 virtual bool isLocalFrame() const OVERRIDE { return true; } 70 virtual bool isLocalFrame() const OVERRIDE { return true; }
71 71
72 void init(); 72 void init();
73 void setView(PassRefPtr<FrameView>); 73 void setView(PassRefPtr<FrameView>);
74 void createView(const IntSize&, const Color&, bool, 74 void createView(const IntSize&, const Color&, bool,
75 ScrollbarMode = ScrollbarAuto, bool horizontalLock = false, 75 ScrollbarMode = ScrollbarAuto, bool horizontalLock = false,
76 ScrollbarMode = ScrollbarAuto, bool verticalLock = false); 76 ScrollbarMode = ScrollbarAuto, bool verticalLock = false);
77 77
78 virtual ~LocalFrame(); 78 virtual ~LocalFrame();
79 79
80 virtual void detach() OVERRIDE;
81
80 void addDestructionObserver(FrameDestructionObserver*); 82 void addDestructionObserver(FrameDestructionObserver*);
81 void removeDestructionObserver(FrameDestructionObserver*); 83 void removeDestructionObserver(FrameDestructionObserver*);
82 84
83 void willDetachFrameHost(); 85 void willDetachFrameHost();
84 void detachFromFrameHost(); 86 void detachFromFrameHost();
85 87
86 virtual void disconnectOwnerElement() OVERRIDE; 88 virtual void disconnectOwnerElement() OVERRIDE;
87 89
88 virtual void setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow>) OVERRI DE; 90 virtual void setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow>) OVERRI DE;
89 FrameView* view() const; 91 FrameView* view() const;
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, localFrame->isLocalFrame(), localFrame.isLocalFrame()); 246 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, localFrame->isLocalFrame(), localFrame.isLocalFrame());
245 247
246 } // namespace blink 248 } // namespace blink
247 249
248 // During refactoring, there are some places where we need to do type conversion s that 250 // During refactoring, there are some places where we need to do type conversion s that
249 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte d out. 251 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte d out.
250 // At that time this #define will be removed and all the uses of it will need to be corrected. 252 // At that time this #define will be removed and all the uses of it will need to be corrected.
251 #define toLocalFrameTemporary toLocalFrame 253 #define toLocalFrameTemporary toLocalFrame
252 254
253 #endif // LocalFrame_h 255 #endif // LocalFrame_h
OLDNEW
« no previous file with comments | « Source/core/frame/Frame.cpp ('k') | Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698