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

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

Issue 2628683003: Add DidSaveScrollOrScaleState flag to prevent restoreScrollPositionAndViewState restore from default (Closed)
Patch Set: revert test Created 3 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, 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. 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
4 * (http://www.torchmobile.com/) 4 * (http://www.torchmobile.com/)
5 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 5 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
6 * Copyright (C) 2011 Google Inc. All rights reserved. 6 * Copyright (C) 2011 Google Inc. All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 SameDocumentNavigationSource, 196 SameDocumentNavigationSource,
197 PassRefPtr<SerializedScriptValue>, 197 PassRefPtr<SerializedScriptValue>,
198 HistoryScrollRestorationType, 198 HistoryScrollRestorationType,
199 FrameLoadType, 199 FrameLoadType,
200 Document*); 200 Document*);
201 201
202 HistoryItem* currentItem() const { return m_currentItem.get(); } 202 HistoryItem* currentItem() const { return m_currentItem.get(); }
203 void saveScrollState(); 203 void saveScrollState();
204 204
205 void restoreScrollPositionAndViewState(); 205 void restoreScrollPositionAndViewState();
206 void setScrollFromNavigation(const KURL* = nullptr,
207 LoadStartType = NavigationToDifferentDocument);
206 208
207 bool shouldContinueForNavigationPolicy(const ResourceRequest&, 209 bool shouldContinueForNavigationPolicy(const ResourceRequest&,
208 const SubstituteData&, 210 const SubstituteData&,
209 DocumentLoader*, 211 DocumentLoader*,
210 ContentSecurityPolicyDisposition, 212 ContentSecurityPolicyDisposition,
211 NavigationType, 213 NavigationType,
212 NavigationPolicy, 214 NavigationPolicy,
213 bool shouldReplaceCurrentEntry, 215 bool shouldReplaceCurrentEntry,
214 bool isClientRedirect, 216 bool isClientRedirect,
215 HTMLFormElement*); 217 HTMLFormElement*);
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 SandboxFlags m_forcedSandboxFlags; 324 SandboxFlags m_forcedSandboxFlags;
323 325
324 bool m_dispatchingDidClearWindowObjectInMainWorld; 326 bool m_dispatchingDidClearWindowObjectInMainWorld;
325 bool m_protectProvisionalLoader; 327 bool m_protectProvisionalLoader;
326 bool m_isNavigationHandledByClient; 328 bool m_isNavigationHandledByClient;
327 }; 329 };
328 330
329 } // namespace blink 331 } // namespace blink
330 332
331 #endif // FrameLoader_h 333 #endif // FrameLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698