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

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

Issue 123133006: Expose a cachePolicy parameter to loadHistoryItem. (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
« no previous file with comments | « no previous file | Source/core/loader/FrameLoader.cpp » ('j') | public/web/WebFrame.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 23 matching lines...) Expand all
34 34
35 #include "core/dom/IconURL.h" 35 #include "core/dom/IconURL.h"
36 #include "core/dom/SandboxFlags.h" 36 #include "core/dom/SandboxFlags.h"
37 #include "core/dom/SecurityContext.h" 37 #include "core/dom/SecurityContext.h"
38 #include "core/fetch/ResourceLoaderOptions.h" 38 #include "core/fetch/ResourceLoaderOptions.h"
39 #include "core/history/HistoryItem.h" 39 #include "core/history/HistoryItem.h"
40 #include "core/loader/FrameLoaderStateMachine.h" 40 #include "core/loader/FrameLoaderStateMachine.h"
41 #include "core/loader/FrameLoaderTypes.h" 41 #include "core/loader/FrameLoaderTypes.h"
42 #include "core/loader/MixedContentChecker.h" 42 #include "core/loader/MixedContentChecker.h"
43 #include "platform/Timer.h" 43 #include "platform/Timer.h"
44 #include "platform/network/ResourceRequest.h"
44 #include "wtf/Forward.h" 45 #include "wtf/Forward.h"
45 #include "wtf/HashSet.h" 46 #include "wtf/HashSet.h"
46 #include "wtf/OwnPtr.h" 47 #include "wtf/OwnPtr.h"
47 48
48 namespace WebCore { 49 namespace WebCore {
49 50
50 class Resource; 51 class Resource;
51 class Chrome; 52 class Chrome;
52 class DOMWrapperWorld; 53 class DOMWrapperWorld;
53 class DocumentLoader; 54 class DocumentLoader;
54 class Event; 55 class Event;
55 class FetchContext; 56 class FetchContext;
56 class FormState; 57 class FormState;
57 class FormSubmission; 58 class FormSubmission;
58 class FrameLoaderClient; 59 class FrameLoaderClient;
59 class IconController; 60 class IconController;
60 class NavigationAction; 61 class NavigationAction;
61 class Page; 62 class Page;
62 class ResourceError; 63 class ResourceError;
63 class ResourceRequest;
64 class ResourceResponse; 64 class ResourceResponse;
65 class SecurityOrigin; 65 class SecurityOrigin;
66 class SerializedScriptValue; 66 class SerializedScriptValue;
67 class SubstituteData; 67 class SubstituteData;
68 68
69 struct FrameLoadRequest; 69 struct FrameLoadRequest;
70 struct WindowFeatures; 70 struct WindowFeatures;
71 71
72 bool isBackForwardLoadType(FrameLoadType); 72 bool isBackForwardLoadType(FrameLoadType);
73 73
74 class FrameLoader { 74 class FrameLoader {
75 WTF_MAKE_NONCOPYABLE(FrameLoader); 75 WTF_MAKE_NONCOPYABLE(FrameLoader);
76 public: 76 public:
77 FrameLoader(Frame*, FrameLoaderClient*); 77 FrameLoader(Frame*, FrameLoaderClient*);
78 ~FrameLoader(); 78 ~FrameLoader();
79 79
80 void init(); 80 void init();
81 81
82 Frame* frame() const { return m_frame; } 82 Frame* frame() const { return m_frame; }
83 83
84 MixedContentChecker* mixedContentChecker() const { return &m_mixedContentChe cker; } 84 MixedContentChecker* mixedContentChecker() const { return &m_mixedContentChe cker; }
85 85
86 // These functions start a load. All eventually call into loadWithNavigation Action() or loadInSameDocument(). 86 // These functions start a load. All eventually call into loadWithNavigation Action() or loadInSameDocument().
87 void load(const FrameLoadRequest&); // The entry point for non-reload, non-h istory loads. 87 void load(const FrameLoadRequest&); // The entry point for non-reload, non-h istory loads.
88 void reload(ReloadPolicy = NormalReload, const KURL& overrideURL = KURL(), c onst AtomicString& overrideEncoding = nullAtom); 88 void reload(ReloadPolicy = NormalReload, const KURL& overrideURL = KURL(), c onst AtomicString& overrideEncoding = nullAtom);
89 void loadHistoryItem(HistoryItem*, HistoryLoadType = HistoryDifferentDocumen tLoad); // The entry point for all back/forward loads 89 void loadHistoryItem(HistoryItem*, HistoryLoadType = HistoryDifferentDocumen tLoad, ResourceRequestCachePolicy = UseProtocolCachePolicy); // The entry point for all back/forward loads
90 90
91 static void reportLocalLoadFailed(Frame*, const String& url); 91 static void reportLocalLoadFailed(Frame*, const String& url);
92 92
93 // FIXME: These are all functions which stop loads. We have too many. 93 // FIXME: These are all functions which stop loads. We have too many.
94 // Warning: stopAllLoaders can and will detach the Frame out from under you. All callers need to either protect the Frame 94 // Warning: stopAllLoaders can and will detach the Frame out from under you. All callers need to either protect the Frame
95 // or guarantee they won't in any way access the Frame after stopAllLoaders returns. 95 // or guarantee they won't in any way access the Frame after stopAllLoaders returns.
96 void stopAllLoaders(); 96 void stopAllLoaders();
97 void stopLoading(); 97 void stopLoading();
98 bool closeURL(); 98 bool closeURL();
99 // FIXME: clear() is trying to do too many things. We should break it down i nto smaller functions. 99 // FIXME: clear() is trying to do too many things. We should break it down i nto smaller functions.
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 287
288 bool m_didAccessInitialDocument; 288 bool m_didAccessInitialDocument;
289 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 289 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
290 290
291 SandboxFlags m_forcedSandboxFlags; 291 SandboxFlags m_forcedSandboxFlags;
292 }; 292 };
293 293
294 } // namespace WebCore 294 } // namespace WebCore
295 295
296 #endif // FrameLoader_h 296 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/loader/FrameLoader.cpp » ('j') | public/web/WebFrame.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698