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

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

Issue 561153002: Mixed Content: Migrate ResourceFetcher to the static mixed content checker. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixing comment and test. Created 6 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/fetch/ResourceFetcher.cpp ('k') | Source/core/loader/MixedContentChecker.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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 }; 73 };
74 74
75 enum ContextType { 75 enum ContextType {
76 ContextTypeBlockable, 76 ContextTypeBlockable,
77 ContextTypeOptionallyBlockable, 77 ContextTypeOptionallyBlockable,
78 ContextTypeShouldBeBlockable, 78 ContextTypeShouldBeBlockable,
79 ContextTypeBlockableUnlessLax 79 ContextTypeBlockableUnlessLax
80 }; 80 };
81 81
82 static ContextType contextTypeFromContext(WebURLRequest::RequestContext); 82 static ContextType contextTypeFromContext(WebURLRequest::RequestContext);
83 static const char* typeNameFromContext(WebURLRequest::RequestContext);
84 static void logToConsole(LocalFrame*, const KURL&, WebURLRequest::RequestCon text, bool allowed);
83 85
84 // FIXME: This should probably have a separate client from FrameLoader. 86 // FIXME: This should probably have a separate client from FrameLoader.
85 FrameLoaderClient* client() const; 87 FrameLoaderClient* client() const;
86 88
87 bool canDisplayInsecureContentInternal(SecurityOrigin*, const KURL&, const M ixedContentType) const; 89 bool canDisplayInsecureContentInternal(SecurityOrigin*, const KURL&, const M ixedContentType) const;
88 90
89 bool canRunInsecureContentInternal(SecurityOrigin*, const KURL&, const Mixed ContentType) const; 91 bool canRunInsecureContentInternal(SecurityOrigin*, const KURL&, const Mixed ContentType) const;
90 92
91 void logWarning(bool allowed, const KURL& i, const MixedContentType) const; 93 void logWarning(bool allowed, const KURL& i, const MixedContentType) const;
92 94
93 LocalFrame* m_frame; 95 LocalFrame* m_frame;
94 }; 96 };
95 97
96 } // namespace blink 98 } // namespace blink
97 99
98 #endif // MixedContentChecker_h 100 #endif // MixedContentChecker_h
OLDNEW
« no previous file with comments | « Source/core/fetch/ResourceFetcher.cpp ('k') | Source/core/loader/MixedContentChecker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698