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

Unified Diff: Source/core/frame/Frame.h

Issue 1041473002: Detach old frame on WebFrame::swap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/core/frame/Frame.cpp » ('j') | Source/core/loader/FrameLoader.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/Frame.h
diff --git a/Source/core/frame/Frame.h b/Source/core/frame/Frame.h
index bccaf64b1edd41d460a508173fbd9aa9b447ea3b..e8d88280c922a17bd25d1bf0977865c56f803949 100644
--- a/Source/core/frame/Frame.h
+++ b/Source/core/frame/Frame.h
@@ -53,6 +53,9 @@ class Settings;
class WindowProxy;
class WindowProxyManager;
+enum class FrameDetachType { Remove,
dcheng 2015/06/08 19:34:42 This is wrapped weird. Just put it all on one line
lfg 2015/06/10 18:41:28 git cl format did this :(. Fixed.
+ Swap };
+
// Status of user gesture.
enum class UserGestureStatus { Active, None };
@@ -71,7 +74,7 @@ public:
virtual void navigate(Document& originDocument, const KURL&, bool lockBackForwardList, UserGestureStatus) = 0;
virtual void reload(ReloadPolicy, ClientRedirectPolicy) = 0;
- virtual void detach();
+ virtual void detach(FrameDetachType);
void detachChildren();
virtual void disconnectOwnerElement();
@@ -98,6 +101,7 @@ public:
Frame* findFrameForNavigation(const AtomicString& name, Frame& activeFrame);
Frame* findUnsafeParentScrollPropagationBoundary();
+ void prepareSwapFrom(Frame*);
void finishSwapFrom(Frame*);
bool canNavigate(const Frame&);
« no previous file with comments | « no previous file | Source/core/frame/Frame.cpp » ('j') | Source/core/loader/FrameLoader.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698