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

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

Issue 643333002: Prepare for remote->local frame swap (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/web/WebRemoteFrameImpl.cpp ('k') | public/web/WebLocalFrame.h » ('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) 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 649 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 #if ENABLE(OILPAN) 660 #if ENABLE(OILPAN)
661 static void traceFrames(Visitor*, WebFrame*); 661 static void traceFrames(Visitor*, WebFrame*);
662 void clearWeakFrames(Visitor*); 662 void clearWeakFrames(Visitor*);
663 #endif 663 #endif
664 #endif 664 #endif
665 665
666 protected: 666 protected:
667 WebFrame(); 667 WebFrame();
668 virtual ~WebFrame(); 668 virtual ~WebFrame();
669 669
670 // Sets the parent WITHOUT fulling adding it to the frame tree.
671 // Used to lie to a local frame that is replacing a remote frame,
672 // so it can properly start a navigation but wait to swap until
673 // commit-time.
674 void setParent(WebFrame*);
675
670 private: 676 private:
671 friend class OpenedFrameTracker; 677 friend class OpenedFrameTracker;
672 678
673 #if BLINK_IMPLEMENTATION 679 #if BLINK_IMPLEMENTATION
674 #if ENABLE(OILPAN) 680 #if ENABLE(OILPAN)
675 static void traceFrame(Visitor*, WebFrame*); 681 static void traceFrame(Visitor*, WebFrame*);
676 static bool isFrameAlive(Visitor*, const WebFrame*); 682 static bool isFrameAlive(Visitor*, const WebFrame*);
677 #endif 683 #endif
678 #endif 684 #endif
679 685
680 WebFrame* m_parent; 686 WebFrame* m_parent;
681 WebFrame* m_previousSibling; 687 WebFrame* m_previousSibling;
682 WebFrame* m_nextSibling; 688 WebFrame* m_nextSibling;
683 WebFrame* m_firstChild; 689 WebFrame* m_firstChild;
684 WebFrame* m_lastChild; 690 WebFrame* m_lastChild;
685 691
686 WebFrame* m_opener; 692 WebFrame* m_opener;
687 WebPrivateOwnPtr<OpenedFrameTracker> m_openedFrameTracker; 693 WebPrivateOwnPtr<OpenedFrameTracker> m_openedFrameTracker;
688 }; 694 };
689 695
690 #if BLINK_IMPLEMENTATION 696 #if BLINK_IMPLEMENTATION
691 Frame* toCoreFrame(const WebFrame*); 697 Frame* toCoreFrame(const WebFrame*);
692 #endif 698 #endif
693 699
694 } // namespace blink 700 } // namespace blink
695 701
696 #endif 702 #endif
OLDNEW
« no previous file with comments | « Source/web/WebRemoteFrameImpl.cpp ('k') | public/web/WebLocalFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698