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

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

Issue 1058403002: Revert of Refactor frame navigation/detach state cleanup to be more sane. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 8 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/LocalDOMWindow.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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 // ======== 182 // ========
183 183
184 private: 184 private:
185 LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*); 185 LocalFrame(FrameLoaderClient*, FrameHost*, FrameOwner*);
186 186
187 // Internal Frame helper overrides: 187 // Internal Frame helper overrides:
188 WindowProxyManager* windowProxyManager() const override; 188 WindowProxyManager* windowProxyManager() const override;
189 189
190 String localLayerTreeAsText(unsigned flags) const; 190 String localLayerTreeAsText(unsigned flags) const;
191 191
192 void detachView();
193
192 // Paints the area for the given rect into a DragImage, with the given d isplayItemClient id attached. 194 // Paints the area for the given rect into a DragImage, with the given d isplayItemClient id attached.
193 // The rect is in the coordinate space of the frame. 195 // The rect is in the coordinate space of the frame.
194 PassOwnPtr<DragImage> paintIntoDragImage(const DisplayItemClientWrapper& , DisplayItem::Type, RespectImageOrientationEnum shouldRespectImageOrientation, IntRect paintingRect); 196 PassOwnPtr<DragImage> paintIntoDragImage(const DisplayItemClientWrapper& , DisplayItem::Type, RespectImageOrientationEnum shouldRespectImageOrientation, IntRect paintingRect);
195 197
196 mutable FrameLoader m_loader; 198 mutable FrameLoader m_loader;
197 mutable NavigationScheduler m_navigationScheduler; 199 mutable NavigationScheduler m_navigationScheduler;
198 200
199 RefPtrWillBeMember<FrameView> m_view; 201 RefPtrWillBeMember<FrameView> m_view;
200 RefPtrWillBeMember<LocalDOMWindow> m_domWindow; 202 RefPtrWillBeMember<LocalDOMWindow> m_domWindow;
201 // Usually 0. Non-null if this is the top frame of PagePopup. 203 // Usually 0. Non-null if this is the top frame of PagePopup.
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, localFrame->isLocalFrame(), localFrame.isLocalFrame()); 313 DEFINE_TYPE_CASTS(LocalFrame, Frame, localFrame, localFrame->isLocalFrame(), localFrame.isLocalFrame());
312 314
313 } // namespace blink 315 } // namespace blink
314 316
315 // During refactoring, there are some places where we need to do type conversion s that 317 // During refactoring, there are some places where we need to do type conversion s that
316 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte d out. 318 // will not be needed once all instances of LocalFrame and RemoteFrame are sorte d out.
317 // At that time this #define will be removed and all the uses of it will need to be corrected. 319 // At that time this #define will be removed and all the uses of it will need to be corrected.
318 #define toLocalFrameTemporary toLocalFrame 320 #define toLocalFrameTemporary toLocalFrame
319 321
320 #endif // LocalFrame_h 322 #endif // LocalFrame_h
OLDNEW
« no previous file with comments | « Source/core/frame/LocalDOMWindow.cpp ('k') | Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698