Attach mixed content status to resource requests when sent to devtools

Source/core/loader/MixedContentChecker.h

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 31 matching lines @@
 class FrameLoaderClient;
 class LocalFrame;
 class KURL;
 class SecurityOrigin;
 
 class CORE_EXPORT MixedContentChecker final {
     WTF_MAKE_NONCOPYABLE(MixedContentChecker);
     DISALLOW_ALLOCATION();
 public:
     enum ReportingStatus { SendReport, SuppressReport };
-    static bool shouldBlockFetch(LocalFrame*, WebURLRequest::RequestContext, WebURLRequest::FrameType, const KURL&, ReportingStatus = SendReport);
-    static bool shouldBlockFetch(LocalFrame* frame, const ResourceRequest& request, const KURL& url, ReportingStatus status = SendReport)
+
+    static bool shouldBlockFetch(LocalFrame* frame, WebURLRequest::RequestContext context, WebURLRequest::FrameType frameType, const KURL& url, ReportingStatus status = SendReport)
     {
-        return shouldBlockFetch(frame, request.requestContext(), request.frameType(), url, status);
+        return shouldBlockFetch(frame, nullptr, context, frameType, url, status);
+    }
+
+    // Checks if the given request should be blocked due to mixed
+    // content restrictions. Returns true if it should be blocked and
+    // false if it should be allowed. Mutates |request| (if not nullptr)
+    // to set |request->contextType()| indicating which type of
+    // mixed content it is.
+    static bool shouldBlockFetch(LocalFrame* frame, ResourceRequest* request, const KURL& url, ReportingStatus status = SendReport)
+    {
+        return shouldBlockFetch(frame, request, request->requestContext(), request->frameType(), url, status);
     }
 
     static bool shouldBlockWebSocket(LocalFrame*, const KURL&, ReportingStatus = SendReport);
 
     static bool isMixedContent(SecurityOrigin*, const KURL&);
     static bool isMixedFormAction(LocalFrame*, const KURL&, ReportingStatus = SendReport);
 
     static void checkMixedPrivatePublic(LocalFrame*, const AtomicString& resourceIPAddress);
 
 private:
     enum MixedContentType {
         Display,
         Execution,
         WebSocket,
         Submission
     };
 
-    enum ContextType {
-        ContextTypeBlockable,
-        ContextTypeOptionallyBlockable,
-        ContextTypeShouldBeBlockable,
-    };
+    static bool shouldBlockFetch(LocalFrame*, ResourceRequest*, WebURLRequest::RequestContext, WebURLRequest::FrameType, const KURL&, ReportingStatus = SendReport);
 
     static LocalFrame* inWhichFrameIsContentMixed(LocalFrame*, WebURLRequest::FrameType, const KURL&);
 
-    static ContextType contextTypeFromContext(WebURLRequest::RequestContext, LocalFrame*);
+    static ResourceRequest::ContextType contextTypeFromContext(WebURLRequest::RequestContext, LocalFrame*);
     static const char* typeNameFromContext(WebURLRequest::RequestContext);
     static void logToConsoleAboutFetch(LocalFrame*, const KURL&, WebURLRequest::RequestContext, bool allowed);
     static void logToConsoleAboutWebSocket(LocalFrame*, const KURL&, bool allowed);
     static void count(LocalFrame*, WebURLRequest::RequestContext);
 };
 
 } // namespace blink
 
 #endif // MixedContentChecker_h