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

Side by Side Diff: Source/core/page/HistoryController.h

Issue 145493005: Keep frames to navigate alive in HistoryController::goToEntry() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 148
149 PassRefPtr<HistoryItem> currentItemForExport(); 149 PassRefPtr<HistoryItem> currentItemForExport();
150 PassRefPtr<HistoryItem> previousItemForExport(); 150 PassRefPtr<HistoryItem> previousItemForExport();
151 HistoryItem* itemForNewChildFrame(Frame*) const; 151 HistoryItem* itemForNewChildFrame(Frame*) const;
152 void removeChildrenForRedirect(Frame*); 152 void removeChildrenForRedirect(Frame*);
153 153
154 void setDefersLoading(bool); 154 void setDefersLoading(bool);
155 155
156 private: 156 private:
157 void goToEntry(PassOwnPtr<HistoryEntry>, ResourceRequestCachePolicy); 157 void goToEntry(PassOwnPtr<HistoryEntry>, ResourceRequestCachePolicy);
158 typedef HashMap<Frame*, HistoryItem*> HistoryFrameLoadSet; 158 class HistoryFrameLoad;
159 typedef HashMap<Frame*, OwnPtr<HistoryFrameLoad> > HistoryFrameLoadSet;
Nate Chapin 2014/01/23 18:19:11 Can we change this to Hashmap<RefPtr<Frame>, Histo
Jens Widell 2014/01/23 18:52:18 Certainly; much better that way. I think I assume
159 void recursiveGoToEntry(Frame*, HistoryFrameLoadSet& sameDocumentLoads, Hist oryFrameLoadSet& differentDocumentLoads); 160 void recursiveGoToEntry(Frame*, HistoryFrameLoadSet& sameDocumentLoads, Hist oryFrameLoadSet& differentDocumentLoads);
160 161
161 void updateForInitialLoadInChildFrame(Frame*, HistoryItem*); 162 void updateForInitialLoadInChildFrame(Frame*, HistoryItem*);
162 void createNewBackForwardItem(Frame*, HistoryItem*, bool doClip); 163 void createNewBackForwardItem(Frame*, HistoryItem*, bool doClip);
163 164
164 Page* m_page; 165 Page* m_page;
165 166
166 OwnPtr<HistoryEntry> m_currentEntry; 167 OwnPtr<HistoryEntry> m_currentEntry;
167 OwnPtr<HistoryEntry> m_previousEntry; 168 OwnPtr<HistoryEntry> m_previousEntry;
168 OwnPtr<HistoryEntry> m_provisionalEntry; 169 OwnPtr<HistoryEntry> m_provisionalEntry;
169 170
170 bool m_defersLoading; 171 bool m_defersLoading;
171 RefPtr<HistoryItem> m_deferredItem; 172 RefPtr<HistoryItem> m_deferredItem;
172 ResourceRequestCachePolicy m_deferredCachePolicy; 173 ResourceRequestCachePolicy m_deferredCachePolicy;
173 }; 174 };
174 175
175 } // namespace WebCore 176 } // namespace WebCore
176 177
177 #endif // HistoryController_h 178 #endif // HistoryController_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698