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

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

Issue 2068443002: Revert of Move 'frame-src' CSP checks into FrameFetchContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run revert on local machine to resolve conflicts 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 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 180
181 bool allowPlugins(ReasonForCallingAllowPlugins); 181 bool allowPlugins(ReasonForCallingAllowPlugins);
182 182
183 void updateForSameDocumentNavigation(const KURL&, SameDocumentNavigationSour ce, PassRefPtr<SerializedScriptValue>, HistoryScrollRestorationType, FrameLoadTy pe, Document*); 183 void updateForSameDocumentNavigation(const KURL&, SameDocumentNavigationSour ce, PassRefPtr<SerializedScriptValue>, HistoryScrollRestorationType, FrameLoadTy pe, Document*);
184 184
185 HistoryItem* currentItem() const { return m_currentItem.get(); } 185 HistoryItem* currentItem() const { return m_currentItem.get(); }
186 void saveScrollState(); 186 void saveScrollState();
187 187
188 void restoreScrollPositionAndViewState(); 188 void restoreScrollPositionAndViewState();
189 189
190 bool shouldContinueForNavigationPolicy(const ResourceRequest&, const Substit uteData&, DocumentLoader*, 190 bool shouldContinueForNavigationPolicy(const ResourceRequest&, const Substit uteData&, DocumentLoader*, ContentSecurityPolicyDisposition,
191 NavigationType, NavigationPolicy, bool shouldReplaceCurrentEntry, bool i sClientRedirect); 191 NavigationType, NavigationPolicy, bool shouldReplaceCurrentEntry, bool i sClientRedirect);
192 192
193 DECLARE_TRACE(); 193 DECLARE_TRACE();
194 194
195 private: 195 private:
196 void checkTimerFired(Timer<FrameLoader>*); 196 void checkTimerFired(Timer<FrameLoader>*);
197 void didAccessInitialDocumentTimerFired(Timer<FrameLoader>*); 197 void didAccessInitialDocumentTimerFired(Timer<FrameLoader>*);
198 198
199 bool prepareRequestForThisFrame(FrameLoadRequest&); 199 bool prepareRequestForThisFrame(FrameLoadRequest&);
200 static void setReferrerForFrameRequest(ResourceRequest&, ShouldSendReferrer, Document*); 200 static void setReferrerForFrameRequest(ResourceRequest&, ShouldSendReferrer, Document*);
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 283
284 SandboxFlags m_forcedSandboxFlags; 284 SandboxFlags m_forcedSandboxFlags;
285 285
286 bool m_dispatchingDidClearWindowObjectInMainWorld; 286 bool m_dispatchingDidClearWindowObjectInMainWorld;
287 bool m_protectProvisionalLoader; 287 bool m_protectProvisionalLoader;
288 }; 288 };
289 289
290 } // namespace blink 290 } // namespace blink
291 291
292 #endif // FrameLoader_h 292 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameFetchContext.cpp ('k') | third_party/WebKit/Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698