Chromium Code Reviews| 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 30 matching lines...) Expand all Loading... | |
| 41 | 41 |
| 42 namespace blink { | 42 namespace blink { |
| 43 | 43 |
| 44 class Frame; | 44 class Frame; |
| 45 class FrameLoaderClient; | 45 class FrameLoaderClient; |
| 46 class LocalFrame; | 46 class LocalFrame; |
| 47 class KURL; | 47 class KURL; |
| 48 class ResourceResponse; | 48 class ResourceResponse; |
| 49 class SecurityOrigin; | 49 class SecurityOrigin; |
| 50 | 50 |
| 51 // Checks all sub-resource loads for mixed-content. Frame-level loads are | |
| 52 // checked at the browser by MixedContentNavigationThrottle. Changes to this | |
| 53 // class might need to be reflected on its browser counterpart. | |
| 54 // | |
| 55 // Current mixed content draft that drives this implementation: | |
| 56 // https://w3c.github.io/webappsec-mixed-content/ | |
|
Mike West
2016/07/19 14:39:32
Can you file a bug to move whatever else we can up
carlosk
2016/07/19 16:32:16
Sub resource loads are more complicated to handle
| |
| 51 class CORE_EXPORT MixedContentChecker final { | 57 class CORE_EXPORT MixedContentChecker final { |
| 52 WTF_MAKE_NONCOPYABLE(MixedContentChecker); | 58 WTF_MAKE_NONCOPYABLE(MixedContentChecker); |
| 53 DISALLOW_NEW(); | 59 DISALLOW_NEW(); |
| 54 public: | 60 public: |
| 55 enum ReportingStatus { SendReport, SuppressReport }; | 61 enum ReportingStatus { SendReport, SuppressReport }; |
| 56 static bool shouldBlockFetch(LocalFrame*, WebURLRequest::RequestContext, Web URLRequest::FrameType, ResourceRequest::RedirectStatus, const KURL&, ReportingSt atus = SendReport); | 62 static bool shouldBlockFetch(LocalFrame*, WebURLRequest::RequestContext, Web URLRequest::FrameType, ResourceRequest::RedirectStatus, const KURL&, ReportingSt atus = SendReport); |
| 57 static bool shouldBlockFetch(LocalFrame* frame, const ResourceRequest& reque st, const KURL& url, ReportingStatus status = SendReport) | 63 static bool shouldBlockFetch(LocalFrame* frame, const ResourceRequest& reque st, const KURL& url, ReportingStatus status = SendReport) |
| 58 { | 64 { |
| 59 return shouldBlockFetch(frame, request.requestContext(), request.frameTy pe(), request.redirectStatus(), url, status); | 65 return shouldBlockFetch(frame, request.requestContext(), request.frameTy pe(), request.redirectStatus(), url, status); |
| 60 } | 66 } |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 80 static Frame* inWhichFrameIsContentMixed(Frame*, WebURLRequest::FrameType, c onst KURL&); | 86 static Frame* inWhichFrameIsContentMixed(Frame*, WebURLRequest::FrameType, c onst KURL&); |
| 81 | 87 |
| 82 static void logToConsoleAboutFetch(LocalFrame*, const KURL&, const KURL&, We bURLRequest::RequestContext, bool allowed); | 88 static void logToConsoleAboutFetch(LocalFrame*, const KURL&, const KURL&, We bURLRequest::RequestContext, bool allowed); |
| 83 static void logToConsoleAboutWebSocket(LocalFrame*, const KURL&, const KURL& , bool allowed); | 89 static void logToConsoleAboutWebSocket(LocalFrame*, const KURL&, const KURL& , bool allowed); |
| 84 static void count(Frame*, WebURLRequest::RequestContext); | 90 static void count(Frame*, WebURLRequest::RequestContext); |
| 85 }; | 91 }; |
| 86 | 92 |
| 87 } // namespace blink | 93 } // namespace blink |
| 88 | 94 |
| 89 #endif // MixedContentChecker_h | 95 #endif // MixedContentChecker_h |
| OLD | NEW |