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

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

Issue 2790693002: Split CSP into pre- and post-upgrade checks (Closed)
Patch Set: revert accidental AbstractWorker change Created 3 years, 8 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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 const ResourceRequest&, 195 const ResourceRequest&,
196 const SubstituteData&, 196 const SubstituteData&,
197 DocumentLoader*, 197 DocumentLoader*,
198 ContentSecurityPolicyDisposition, 198 ContentSecurityPolicyDisposition,
199 NavigationType, 199 NavigationType,
200 NavigationPolicy, 200 NavigationPolicy,
201 FrameLoadType, 201 FrameLoadType,
202 bool is_client_redirect, 202 bool is_client_redirect,
203 HTMLFormElement*); 203 HTMLFormElement*);
204 204
205 // Like ShouldContinueForNavigationPolicy, but should be used when following
206 // redirects.
207 NavigationPolicy ShouldContinueForRedirectNavigationPolicy(
208 const ResourceRequest&,
209 const SubstituteData&,
210 DocumentLoader*,
211 ContentSecurityPolicyDisposition,
212 NavigationType,
213 NavigationPolicy,
214 FrameLoadType,
215 bool is_client_redirect,
216 HTMLFormElement*);
217
205 // Note: When a PlzNavigtate navigation is handled by the client, we will 218 // Note: When a PlzNavigtate navigation is handled by the client, we will
206 // have created a dummy provisional DocumentLoader, so this will return true 219 // have created a dummy provisional DocumentLoader, so this will return true
207 // while the client handles the navigation. 220 // while the client handles the navigation.
208 bool HasProvisionalNavigation() const { return ProvisionalDocumentLoader(); } 221 bool HasProvisionalNavigation() const { return ProvisionalDocumentLoader(); }
209 222
210 void DetachProvisionalDocumentLoader(DocumentLoader*); 223 void DetachProvisionalDocumentLoader(DocumentLoader*);
211 224
212 DECLARE_TRACE(); 225 DECLARE_TRACE();
213 226
214 static void SetReferrerForFrameRequest(FrameLoadRequest&); 227 static void SetReferrerForFrameRequest(FrameLoadRequest&);
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 SandboxFlags forced_sandbox_flags_; 328 SandboxFlags forced_sandbox_flags_;
316 329
317 bool dispatching_did_clear_window_object_in_main_world_; 330 bool dispatching_did_clear_window_object_in_main_world_;
318 bool protect_provisional_loader_; 331 bool protect_provisional_loader_;
319 bool detached_; 332 bool detached_;
320 }; 333 };
321 334
322 } // namespace blink 335 } // namespace blink
323 336
324 #endif // FrameLoader_h 337 #endif // FrameLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698