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

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

Issue 901903003: CSP: Adding the 'upgrade-insecure-requests' directive. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: WebSockets + Tests. Created 5 years, 10 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 | « Source/core/frame/csp/ContentSecurityPolicyTest.cpp ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »
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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 void dispatchDidClearDocumentOfWindowObject(); 137 void dispatchDidClearDocumentOfWindowObject();
138 void dispatchDocumentElementAvailable(); 138 void dispatchDocumentElementAvailable();
139 139
140 // The following sandbox flags will be forced, regardless of changes to 140 // The following sandbox flags will be forced, regardless of changes to
141 // the sandbox attribute of any parent frames. 141 // the sandbox attribute of any parent frames.
142 void forceSandboxFlags(SandboxFlags flags) { m_forcedSandboxFlags |= flags; } 142 void forceSandboxFlags(SandboxFlags flags) { m_forcedSandboxFlags |= flags; }
143 SandboxFlags effectiveSandboxFlags() const; 143 SandboxFlags effectiveSandboxFlags() const;
144 144
145 bool shouldEnforceStrictMixedContentChecking() const; 145 bool shouldEnforceStrictMixedContentChecking() const;
146 146
147 SecurityContext::InsecureContentPolicy insecureContentPolicy() const;
148
147 Frame* opener(); 149 Frame* opener();
148 void setOpener(LocalFrame*); 150 void setOpener(LocalFrame*);
149 151
150 void detach(); 152 void detach();
151 153
152 void loadDone(); 154 void loadDone();
153 void finishedParsing(); 155 void finishedParsing();
154 void checkCompleted(); 156 void checkCompleted();
155 157
156 void commitProvisionalLoad(); 158 void commitProvisionalLoad();
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 260
259 bool m_didAccessInitialDocument; 261 bool m_didAccessInitialDocument;
260 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 262 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
261 263
262 SandboxFlags m_forcedSandboxFlags; 264 SandboxFlags m_forcedSandboxFlags;
263 }; 265 };
264 266
265 } // namespace blink 267 } // namespace blink
266 268
267 #endif // FrameLoader_h 269 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « Source/core/frame/csp/ContentSecurityPolicyTest.cpp ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698