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

Side by Side Diff: third_party/WebKit/public/web/WebFrame.h

Issue 1408073006: Gracefully handle a self-referential opener in frame swap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove friend declaration. Created 5 years, 1 month 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 689 matching lines...) Expand 10 before | Expand all | Expand 10 after
700 explicit WebFrame(WebTreeScopeType); 700 explicit WebFrame(WebTreeScopeType);
701 virtual ~WebFrame(); 701 virtual ~WebFrame();
702 702
703 // Sets the parent WITHOUT fulling adding it to the frame tree. 703 // Sets the parent WITHOUT fulling adding it to the frame tree.
704 // Used to lie to a local frame that is replacing a remote frame, 704 // Used to lie to a local frame that is replacing a remote frame,
705 // so it can properly start a navigation but wait to swap until 705 // so it can properly start a navigation but wait to swap until
706 // commit-time. 706 // commit-time.
707 void setParent(WebFrame*); 707 void setParent(WebFrame*);
708 708
709 private: 709 private:
710 friend class OpenedFrameTracker;
711
712 #if BLINK_IMPLEMENTATION 710 #if BLINK_IMPLEMENTATION
713 #if ENABLE(OILPAN) 711 #if ENABLE(OILPAN)
714 static void traceFrame(Visitor*, WebFrame*); 712 static void traceFrame(Visitor*, WebFrame*);
715 static void traceFrame(InlinedGlobalMarkingVisitor, WebFrame*); 713 static void traceFrame(InlinedGlobalMarkingVisitor, WebFrame*);
716 static bool isFrameAlive(const WebFrame*); 714 static bool isFrameAlive(const WebFrame*);
717 715
718 template <typename VisitorDispatcher> 716 template <typename VisitorDispatcher>
719 static void traceFramesImpl(VisitorDispatcher, WebFrame*); 717 static void traceFramesImpl(VisitorDispatcher, WebFrame*);
720 template <typename VisitorDispatcher> 718 template <typename VisitorDispatcher>
721 void clearWeakFramesImpl(VisitorDispatcher); 719 void clearWeakFramesImpl(VisitorDispatcher);
(...skipping 14 matching lines...) Expand all
736 WebPrivateOwnPtr<OpenedFrameTracker> m_openedFrameTracker; 734 WebPrivateOwnPtr<OpenedFrameTracker> m_openedFrameTracker;
737 }; 735 };
738 736
739 #if BLINK_IMPLEMENTATION 737 #if BLINK_IMPLEMENTATION
740 Frame* toCoreFrame(const WebFrame*); 738 Frame* toCoreFrame(const WebFrame*);
741 #endif 739 #endif
742 740
743 } // namespace blink 741 } // namespace blink
744 742
745 #endif 743 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698