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

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

Issue 785133004: Mixed Content: Add use counters for content types. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years 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/UseCounter.h ('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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 enum ContextType { 81 enum ContextType {
82 ContextTypeBlockable, 82 ContextTypeBlockable,
83 ContextTypeOptionallyBlockable, 83 ContextTypeOptionallyBlockable,
84 ContextTypeShouldBeBlockable, 84 ContextTypeShouldBeBlockable,
85 ContextTypeBlockableUnlessLax 85 ContextTypeBlockableUnlessLax
86 }; 86 };
87 87
88 static ContextType contextTypeFromContext(WebURLRequest::RequestContext); 88 static ContextType contextTypeFromContext(WebURLRequest::RequestContext);
89 static const char* typeNameFromContext(WebURLRequest::RequestContext); 89 static const char* typeNameFromContext(WebURLRequest::RequestContext);
90 static void logToConsole(LocalFrame*, const KURL&, WebURLRequest::RequestCon text, bool allowed); 90 static void logToConsole(LocalFrame*, const KURL&, WebURLRequest::RequestCon text, bool allowed);
91 static void count(LocalFrame*, WebURLRequest::RequestContext);
91 92
92 // FIXME: This should probably have a separate client from FrameLoader. 93 // FIXME: This should probably have a separate client from FrameLoader.
93 FrameLoaderClient* client() const; 94 FrameLoaderClient* client() const;
94 95
95 bool canDisplayInsecureContentInternal(SecurityOrigin*, const KURL&, const M ixedContentType) const; 96 bool canDisplayInsecureContentInternal(SecurityOrigin*, const KURL&, const M ixedContentType) const;
96 97
97 bool canRunInsecureContentInternal(SecurityOrigin*, const KURL&, const Mixed ContentType) const; 98 bool canRunInsecureContentInternal(SecurityOrigin*, const KURL&, const Mixed ContentType) const;
98 99
99 void logWarning(bool allowed, const KURL& i, const MixedContentType) const; 100 void logWarning(bool allowed, const KURL& i, const MixedContentType) const;
100 101
101 RawPtrWillBeMember<LocalFrame> m_frame; 102 RawPtrWillBeMember<LocalFrame> m_frame;
102 }; 103 };
103 104
104 } // namespace blink 105 } // namespace blink
105 106
106 #endif // MixedContentChecker_h 107 #endif // MixedContentChecker_h
OLDNEW
« no previous file with comments | « Source/core/frame/UseCounter.h ('k') | Source/core/loader/MixedContentChecker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698