Attach mixed content status to resource requests when sent to devtools

Source/platform/network/ResourceRequest.h

 /*
  * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
  * Copyright (C) 2009, 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 46 matching lines @@
 struct CrossThreadResourceRequestData;
 
 class PLATFORM_EXPORT ResourceRequest {
     WTF_MAKE_FAST_ALLOCATED(ResourceRequest);
 public:
     class ExtraData : public RefCounted<ExtraData> {
     public:
         virtual ~ExtraData() { }
     };
 
+    enum MixedContentStatus {

[Mike West, 2015/08/17 15:36:45]

1. Why not use `MixedContentChecker::ContentType` instead of creating a new
enum?

2. I'd prefer to align with the spec's "blockable" and "optionally blockable"
language.

[estark, 2015/08/17 17:20:12]

Ah, I didn't realize that blockable/optionally blockable was spec language;
thought it was an internal MixedContentChecker thingy. Ok, so I moved
ContextType to be ResourceRequest::ContextType instead of
MixedContentChecker::ContextType, so that ResourceRequest can use it -- does
that sound okay?

There is a small additional wrinkle that ContextType doesn't allow a way to say
that a given request is NOT mixed content. So I added
ResourceRequest::isMixedContent() to distinguish, but that feels a little clunky
to me. (For example, not sure what to initialize ResourceRequest::contextType()
to if isMixedContent() is false.) Another alternative would be to add a
ContextTypeNotMixedContent value to the ContextType enum. What do you think?

+        NotMixedContent,
+        PassiveMixedContent,
+        ActiveMixedContent
+    };
+
     ResourceRequest()
     {
         initialize(KURL());
     }
 
     ResourceRequest(const String& urlString)
     {
         initialize(KURL(ParsedURLString, urlString));
     }
 
@@ skipping 149 matching lines @@
 
     bool originatesFromReservedIPRange() const { return m_originatesFromReservedIPRange; }
     void setOriginatesFromReservedIPRange(bool value) { m_originatesFromReservedIPRange = value; }
 
     InputToLoadPerfMetricReportPolicy inputPerfMetricReportPolicy() const { return m_inputPerfMetricReportPolicy; }
     void setInputPerfMetricReportPolicy(InputToLoadPerfMetricReportPolicy inputPerfMetricReportPolicy) { m_inputPerfMetricReportPolicy = inputPerfMetricReportPolicy; }
 
     void setFollowedRedirect(bool followed) { m_followedRedirect = followed; }
     bool followedRedirect() const { return m_followedRedirect; }
 
+    void setMixedContentStatus(MixedContentStatus status) { m_mixedContentStatus = status; }
+    MixedContentStatus mixedContentStatus() const { return m_mixedContentStatus; }
+
 private:
     void initialize(const KURL&);
 
     const CacheControlHeader& cacheControlHeader() const;
 
     KURL m_url;
     ResourceRequestCachePolicy m_cachePolicy;
     double m_timeoutInterval; // 0 is a magic value for platform default on platforms that have one.
     KURL m_firstPartyForCookies;
     RefPtr<SecurityOrigin> m_requestorOrigin;
@@ skipping 24 matching lines @@
     bool m_checkForBrowserSideNavigation;
     double m_uiStartTime;
     bool m_originatesFromReservedIPRange;
     InputToLoadPerfMetricReportPolicy m_inputPerfMetricReportPolicy;
 
     mutable CacheControlHeader m_cacheControlHeaderCache;
 
     static double s_defaultTimeoutInterval;
 
     bool m_followedRedirect;
+
+    MixedContentStatus m_mixedContentStatus;
 };
 
 bool equalIgnoringHeaderFields(const ResourceRequest&, const ResourceRequest&);
 
 inline bool operator==(const ResourceRequest& a, const ResourceRequest& b) { return ResourceRequest::compare(a, b); }
 inline bool operator!=(ResourceRequest& a, const ResourceRequest& b) { return !(a == b); }
 
 struct CrossThreadResourceRequestData {
     WTF_MAKE_NONCOPYABLE(CrossThreadResourceRequestData); WTF_MAKE_FAST_ALLOCATED(CrossThreadResourceRequestData);
 public:
@@ skipping 25 matching lines @@
     WebURLRequest::FetchRequestMode m_fetchRequestMode;
     WebURLRequest::FetchCredentialsMode m_fetchCredentialsMode;
     WebURLRequest::FetchRedirectMode m_fetchRedirectMode;
     ReferrerPolicy m_referrerPolicy;
     bool m_didSetHTTPReferrer;
     bool m_checkForBrowserSideNavigation;
     double m_uiStartTime;
     bool m_originatesFromReservedIPRange;
     InputToLoadPerfMetricReportPolicy m_inputPerfMetricReportPolicy;
     bool m_followedRedirect;
+    ResourceRequest::MixedContentStatus m_mixedContentStatus;
 };
 
 } // namespace blink
 
 #endif // ResourceRequest_h