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

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

Issue 2148313002: Fix setHistoryItemStateForCommit for back/forward in subframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Initial commit Created 4 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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 bool shouldPerformFragmentNavigation(bool isFormSubmission, const String& ht tpMethod, FrameLoadType, const KURL&); 207 bool shouldPerformFragmentNavigation(bool isFormSubmission, const String& ht tpMethod, FrameLoadType, const KURL&);
208 void processFragment(const KURL&, LoadStartType); 208 void processFragment(const KURL&, LoadStartType);
209 209
210 void startLoad(FrameLoadRequest&, FrameLoadType, NavigationPolicy); 210 void startLoad(FrameLoadRequest&, FrameLoadType, NavigationPolicy);
211 211
212 enum class HistoryNavigationType { 212 enum class HistoryNavigationType {
213 DifferentDocument, 213 DifferentDocument,
214 Fragment, 214 Fragment,
215 HistoryApi 215 HistoryApi
216 }; 216 };
217 void setHistoryItemStateForCommit(HistoryCommitType, HistoryNavigationType); 217 void setHistoryItemStateForCommit(FrameLoadType, HistoryCommitType, HistoryN avigationType);
218 218
219 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state Object, FrameLoadType, HistoryLoadType, ClientRedirectPolicy, Document*); 219 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state Object, FrameLoadType, HistoryLoadType, ClientRedirectPolicy, Document*);
220 220
221 void scheduleCheckCompleted(); 221 void scheduleCheckCompleted();
222 222
223 void detachDocumentLoader(Member<DocumentLoader>&); 223 void detachDocumentLoader(Member<DocumentLoader>&);
224 224
225 std::unique_ptr<TracedValue> toTracedValue() const; 225 std::unique_ptr<TracedValue> toTracedValue() const;
226 void takeObjectSnapshot() const; 226 void takeObjectSnapshot() const;
227 227
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 285
286 SandboxFlags m_forcedSandboxFlags; 286 SandboxFlags m_forcedSandboxFlags;
287 287
288 bool m_dispatchingDidClearWindowObjectInMainWorld; 288 bool m_dispatchingDidClearWindowObjectInMainWorld;
289 bool m_protectProvisionalLoader; 289 bool m_protectProvisionalLoader;
290 }; 290 };
291 291
292 } // namespace blink 292 } // namespace blink
293 293
294 #endif // FrameLoader_h 294 #endif // FrameLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698