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

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

Issue 2022083002: Move 'frame-src' CSP checks into FrameFetchContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: redirects Created 4 years, 6 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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 181
182 bool allowPlugins(ReasonForCallingAllowPlugins); 182 bool allowPlugins(ReasonForCallingAllowPlugins);
183 183
184 void updateForSameDocumentNavigation(const KURL&, SameDocumentNavigationSour ce, PassRefPtr<SerializedScriptValue>, HistoryScrollRestorationType, FrameLoadTy pe, Document*); 184 void updateForSameDocumentNavigation(const KURL&, SameDocumentNavigationSour ce, PassRefPtr<SerializedScriptValue>, HistoryScrollRestorationType, FrameLoadTy pe, Document*);
185 185
186 HistoryItem* currentItem() const { return m_currentItem.get(); } 186 HistoryItem* currentItem() const { return m_currentItem.get(); }
187 void saveScrollState(); 187 void saveScrollState();
188 188
189 void restoreScrollPositionAndViewState(); 189 void restoreScrollPositionAndViewState();
190 190
191 bool shouldContinueForNavigationPolicy(const ResourceRequest&, const Substit uteData&, DocumentLoader*, ContentSecurityPolicyDisposition, 191 bool shouldContinueForNavigationPolicy(const ResourceRequest&, const Substit uteData&, DocumentLoader*,
192 NavigationType, NavigationPolicy, bool shouldReplaceCurrentEntry, bool i sClientRedirect); 192 NavigationType, NavigationPolicy, bool shouldReplaceCurrentEntry, bool i sClientRedirect);
193 193
194 DECLARE_TRACE(); 194 DECLARE_TRACE();
195 195
196 private: 196 private:
197 void checkTimerFired(Timer<FrameLoader>*); 197 void checkTimerFired(Timer<FrameLoader>*);
198 void didAccessInitialDocumentTimerFired(Timer<FrameLoader>*); 198 void didAccessInitialDocumentTimerFired(Timer<FrameLoader>*);
199 199
200 bool prepareRequestForThisFrame(FrameLoadRequest&); 200 bool prepareRequestForThisFrame(FrameLoadRequest&);
201 static void setReferrerForFrameRequest(ResourceRequest&, ShouldSendReferrer, Document*); 201 static void setReferrerForFrameRequest(ResourceRequest&, ShouldSendReferrer, Document*);
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 284
285 SandboxFlags m_forcedSandboxFlags; 285 SandboxFlags m_forcedSandboxFlags;
286 286
287 bool m_dispatchingDidClearWindowObjectInMainWorld; 287 bool m_dispatchingDidClearWindowObjectInMainWorld;
288 bool m_protectProvisionalLoader; 288 bool m_protectProvisionalLoader;
289 }; 289 };
290 290
291 } // namespace blink 291 } // namespace blink
292 292
293 #endif // FrameLoader_h 293 #endif // FrameLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698