OLD | NEW |
---|---|
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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
68 static bool isMixedFormAction(LocalFrame*, const KURL&, ReportingStatus = Se ndReport); | 68 static bool isMixedFormAction(LocalFrame*, const KURL&, ReportingStatus = Se ndReport); |
69 | 69 |
70 static void checkMixedPrivatePublic(LocalFrame*, const AtomicString& resourc eIPAddress); | 70 static void checkMixedPrivatePublic(LocalFrame*, const AtomicString& resourc eIPAddress); |
71 | 71 |
72 static ContextType contextTypeForInspector(LocalFrame*, const ResourceReques t&); | 72 static ContextType contextTypeForInspector(LocalFrame*, const ResourceReques t&); |
73 | 73 |
74 // Returns the frame that should be considered the effective frame | 74 // Returns the frame that should be considered the effective frame |
75 // for a mixed content check for the given frame type. | 75 // for a mixed content check for the given frame type. |
76 static LocalFrame* effectiveFrameForFrameType(LocalFrame*, WebURLRequest::Fr ameType); | 76 static LocalFrame* effectiveFrameForFrameType(LocalFrame*, WebURLRequest::Fr ameType); |
77 | 77 |
78 static void handleCertificateError(LocalFrame*, const KURL&, WebURLRequest:: RequestContext, WebURLRequest::FrameType, const CString& securityInfo); | |
jww
2015/11/20 01:25:08
Yeah, this should almost certainly be a WTF::Strin
estark
2015/11/23 23:40:24
See response to previous comment about WebCString;
jww
2015/11/25 19:24:03
Ah, I see. I missed that. Nevermind then.
| |
79 | |
78 private: | 80 private: |
79 enum MixedContentType { | 81 enum MixedContentType { |
80 Display, | 82 Display, |
81 Execution, | 83 Execution, |
82 WebSocket, | 84 WebSocket, |
83 Submission | 85 Submission |
84 }; | 86 }; |
85 | 87 |
86 static LocalFrame* inWhichFrameIsContentMixed(LocalFrame*, WebURLRequest::Fr ameType, const KURL&); | 88 static LocalFrame* inWhichFrameIsContentMixed(LocalFrame*, WebURLRequest::Fr ameType, const KURL&); |
87 | 89 |
88 static ContextType contextTypeFromContext(WebURLRequest::RequestContext, Loc alFrame*); | 90 static ContextType contextTypeFromContext(WebURLRequest::RequestContext, Loc alFrame*); |
89 static const char* typeNameFromContext(WebURLRequest::RequestContext); | 91 static const char* typeNameFromContext(WebURLRequest::RequestContext); |
90 static void logToConsoleAboutFetch(LocalFrame*, const KURL&, WebURLRequest:: RequestContext, bool allowed); | 92 static void logToConsoleAboutFetch(LocalFrame*, const KURL&, WebURLRequest:: RequestContext, bool allowed); |
91 static void logToConsoleAboutWebSocket(LocalFrame*, const KURL&, bool allowe d); | 93 static void logToConsoleAboutWebSocket(LocalFrame*, const KURL&, bool allowe d); |
92 static void count(LocalFrame*, WebURLRequest::RequestContext); | 94 static void count(LocalFrame*, WebURLRequest::RequestContext); |
93 }; | 95 }; |
94 | 96 |
95 } // namespace blink | 97 } // namespace blink |
96 | 98 |
97 #endif // MixedContentChecker_h | 99 #endif // MixedContentChecker_h |
OLD | NEW |