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

Side by Side Diff: third_party/WebKit/Source/web/FrameLoaderClientImpl.h

Issue 2046733003: Replicate WebInsecureRequestPolicy instead of a bool for strict mixed content checks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@securitycontext
Patch Set: alexmos@ 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) 2009, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2011 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 17 matching lines...) Expand all
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32 #ifndef FrameLoaderClientImpl_h 32 #ifndef FrameLoaderClientImpl_h
33 #define FrameLoaderClientImpl_h 33 #define FrameLoaderClientImpl_h
34 34
35 #include "core/loader/FrameLoaderClient.h" 35 #include "core/loader/FrameLoaderClient.h"
36 #include "platform/heap/Handle.h" 36 #include "platform/heap/Handle.h"
37 #include "platform/weborigin/KURL.h" 37 #include "platform/weborigin/KURL.h"
38 #include "public/platform/WebInsecureRequestPolicy.h"
38 #include "wtf/PassOwnPtr.h" 39 #include "wtf/PassOwnPtr.h"
39 #include "wtf/RefPtr.h" 40 #include "wtf/RefPtr.h"
40 41
41 namespace blink { 42 namespace blink {
42 43
43 class WebLocalFrameImpl; 44 class WebLocalFrameImpl;
44 45
45 class FrameLoaderClientImpl final : public FrameLoaderClient { 46 class FrameLoaderClientImpl final : public FrameLoaderClient {
46 public: 47 public:
47 static FrameLoaderClientImpl* create(WebLocalFrameImpl*); 48 static FrameLoaderClientImpl* create(WebLocalFrameImpl*);
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 bool allowDisplayingInsecureContent(bool enabledPerSettings, const KURL&) ov erride; 144 bool allowDisplayingInsecureContent(bool enabledPerSettings, const KURL&) ov erride;
144 bool allowRunningInsecureContent(bool enabledPerSettings, SecurityOrigin*, c onst KURL&) override; 145 bool allowRunningInsecureContent(bool enabledPerSettings, SecurityOrigin*, c onst KURL&) override;
145 bool allowAutoplay(bool defaultValue) override; 146 bool allowAutoplay(bool defaultValue) override;
146 void didNotAllowScript() override; 147 void didNotAllowScript() override;
147 void didNotAllowPlugins() override; 148 void didNotAllowPlugins() override;
148 void didUseKeygen() override; 149 void didUseKeygen() override;
149 150
150 WebCookieJar* cookieJar() const override; 151 WebCookieJar* cookieJar() const override;
151 void frameFocused() const override; 152 void frameFocused() const override;
152 void didChangeName(const String& name, const String& uniqueName) override; 153 void didChangeName(const String& name, const String& uniqueName) override;
153 void didEnforceStrictMixedContentChecking() override; 154 void didEnforceInsecureRequestPolicy(WebInsecureRequestPolicy) override;
154 void didUpdateToUniqueOrigin() override; 155 void didUpdateToUniqueOrigin() override;
155 void didChangeSandboxFlags(Frame* childFrame, SandboxFlags) override; 156 void didChangeSandboxFlags(Frame* childFrame, SandboxFlags) override;
156 void didAddContentSecurityPolicy(const String& headerValue, ContentSecurityP olicyHeaderType, ContentSecurityPolicyHeaderSource) override; 157 void didAddContentSecurityPolicy(const String& headerValue, ContentSecurityP olicyHeaderType, ContentSecurityPolicyHeaderSource) override;
157 void didChangeFrameOwnerProperties(HTMLFrameElementBase*) override; 158 void didChangeFrameOwnerProperties(HTMLFrameElementBase*) override;
158 159
159 void dispatchWillOpenWebSocket(WebSocketHandle*) override; 160 void dispatchWillOpenWebSocket(WebSocketHandle*) override;
160 161
161 void dispatchWillStartUsingPeerConnectionHandler(WebRTCPeerConnectionHandler *) override; 162 void dispatchWillStartUsingPeerConnectionHandler(WebRTCPeerConnectionHandler *) override;
162 163
163 bool allowWebGL(bool enabledPerSettings) override; 164 bool allowWebGL(bool enabledPerSettings) override;
(...skipping 29 matching lines...) Expand all
193 Member<WebLocalFrameImpl> m_webFrame; 194 Member<WebLocalFrameImpl> m_webFrame;
194 195
195 String m_userAgent; 196 String m_userAgent;
196 }; 197 };
197 198
198 DEFINE_TYPE_CASTS(FrameLoaderClientImpl, FrameLoaderClient, client, client->isFr ameLoaderClientImpl(), client.isFrameLoaderClientImpl()); 199 DEFINE_TYPE_CASTS(FrameLoaderClientImpl, FrameLoaderClient, client, client->isFr ameLoaderClientImpl(), client.isFrameLoaderClientImpl());
199 200
200 } // namespace blink 201 } // namespace blink
201 202
202 #endif 203 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameLoaderClient.h ('k') | third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698