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

Side by Side Diff: Source/core/loader/FrameLoader.h

Issue 1239463005: Replace history.options with history.scrollRestoration attribute (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: address review feedback Created 5 years, 5 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, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2011 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 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
5 * Copyright (C) 2011 Google Inc. All rights reserved. 5 * Copyright (C) 2011 Google Inc. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 10 *
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 175
176 bool shouldClose(); 176 bool shouldClose();
177 void dispatchUnloadEvent(); 177 void dispatchUnloadEvent();
178 178
179 bool allowPlugins(ReasonForCallingAllowPlugins); 179 bool allowPlugins(ReasonForCallingAllowPlugins);
180 180
181 void updateForSameDocumentNavigation(const KURL&, SameDocumentNavigationSour ce, PassRefPtr<SerializedScriptValue>, HistoryScrollRestorationType, FrameLoadTy pe); 181 void updateForSameDocumentNavigation(const KURL&, SameDocumentNavigationSour ce, PassRefPtr<SerializedScriptValue>, HistoryScrollRestorationType, FrameLoadTy pe);
182 182
183 HistoryItem* currentItem() const { return m_currentItem.get(); } 183 HistoryItem* currentItem() const { return m_currentItem.get(); }
184 void saveScrollState(); 184 void saveScrollState();
185 void setScrollRestorationType(HistoryScrollRestorationType);
185 186
186 void restoreScrollPositionAndViewState(); 187 void restoreScrollPositionAndViewState();
187 188
188 DECLARE_TRACE(); 189 DECLARE_TRACE();
189 190
190 private: 191 private:
191 void checkTimerFired(Timer<FrameLoader>*); 192 void checkTimerFired(Timer<FrameLoader>*);
192 void didAccessInitialDocumentTimerFired(Timer<FrameLoader>*); 193 void didAccessInitialDocumentTimerFired(Timer<FrameLoader>*);
193 194
194 bool prepareRequestForThisFrame(FrameLoadRequest&); 195 bool prepareRequestForThisFrame(FrameLoadRequest&);
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 276 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
276 277
277 SandboxFlags m_forcedSandboxFlags; 278 SandboxFlags m_forcedSandboxFlags;
278 279
279 bool m_dispatchingDidClearWindowObjectInMainWorld; 280 bool m_dispatchingDidClearWindowObjectInMainWorld;
280 }; 281 };
281 282
282 } // namespace blink 283 } // namespace blink
283 284
284 #endif // FrameLoader_h 285 #endif // FrameLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698