Mixed Content: Add use counters for content types.

Source/core/loader/MixedContentChecker.cpp

 /*
  * 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 27 matching lines @@
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/weborigin/SchemeRegistry.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "public/platform/Platform.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
-namespace {
-} // namespace
-
 MixedContentChecker::MixedContentChecker(LocalFrame* frame)
     : m_frame(frame)
 {
 }
 
 FrameLoaderClient* MixedContentChecker::client() const
 {
     return m_frame->loader().client();
 }
 
@@ skipping 145 matching lines @@
 {
     String message = String::format(
         "Mixed Content: The page at '%s' was loaded over HTTPS, but requested an insecure %s '%s'. %s",
         frame->document()->url().elidedString().utf8().data(), typeNameFromContext(requestContext), url.elidedString().utf8().data(),
         allowed ? "This content should also be served over HTTPS." : "This request has been blocked; the content must be served over HTTPS.");
     MessageLevel messageLevel = allowed ? WarningMessageLevel : ErrorMessageLevel;
     frame->document()->addConsoleMessage(ConsoleMessage::create(SecurityMessageSource, messageLevel, message));
 }
 
 // static
+void MixedContentChecker::count(LocalFrame* frame, WebURLRequest::RequestContext requestContext)
+{
+    UseCounter::count(frame, UseCounter::MixedContentPresent);
+
+    // Roll blockable content up into a single counter, count unblocked types individually so we
+    // can determine when they can be safely moved to the blockable category:
+    ContextType contextType = contextTypeFromContext(requestContext);
+    if (contextType == ContextTypeBlockable || contextType == ContextTypeBlockableUnlessLax) {
+        UseCounter::count(frame, UseCounter::MixedContentBlockable);
+        return;
+    }
+
+    UseCounter::Feature feature;
+    switch (requestContext) {
+    case WebURLRequest::RequestContextAudio:
+        feature = UseCounter::MixedContentAudio;
+        break;
+    case WebURLRequest::RequestContextDownload:
+        feature = UseCounter::MixedContentDownload;
+        break;
+    case WebURLRequest::RequestContextFavicon:
+        feature = UseCounter::MixedContentFavicon;
+        break;
+    case WebURLRequest::RequestContextImage:
+        feature = UseCounter::MixedContentImage;
+        break;
+    case WebURLRequest::RequestContextInternal:
+        feature = UseCounter::MixedContentInternal;
+        break;
+    case WebURLRequest::RequestContextPlugin:
+        feature = UseCounter::MixedContentPlugin;
+        break;
+    case WebURLRequest::RequestContextPrefetch:
+        feature = UseCounter::MixedContentPrefetch;
+        break;
+    case WebURLRequest::RequestContextVideo:
+        feature = UseCounter::MixedContentVideo;
+        break;
+
+    default:
+        ASSERT_NOT_REACHED();
+        return;
+    }
+    UseCounter::count(frame, feature);
+}
+
+// static
 bool MixedContentChecker::shouldBlockFetch(LocalFrame* frame, const ResourceRequest& resourceRequest, const KURL& url, MixedContentChecker::ReportingStatus reportingStatus)
 {
     // No frame, no mixed content:
     if (!frame)
         return false;
 
     // Check the top frame first.
     if (Frame* top = frame->tree().top()) {
         // FIXME: We need a way to access the top-level frame's SecurityOrigin when that frame
         // is in a different process from the current frame. Until that is done, we bail out
         // early and allow the load.
         if (!top->isLocalFrame())
             return false;
 
         LocalFrame* localTop = toLocalFrame(top);
         if (frame != localTop && shouldBlockFetch(localTop, resourceRequest, url, reportingStatus))
             return true;
     }
 
     // We only care about subresource loads; top-level navigations cannot be mixed content.
     if (resourceRequest.frameType() == WebURLRequest::FrameTypeTopLevel)
         return false;
 
     // No mixed content, no problem.
     if (!isMixedContent(frame->document()->securityOrigin(), url))
         return false;
 
+    MixedContentChecker::count(frame, resourceRequest.requestContext());
+
     Settings* settings = frame->settings();
     FrameLoaderClient* client = frame->loader().client();
     SecurityOrigin* securityOrigin = frame->document()->securityOrigin();
     bool allowed = false;
 
     ContextType contextType = contextTypeFromContext(resourceRequest.requestContext());
     if (contextType == ContextTypeBlockableUnlessLax)
         contextType = RuntimeEnabledFeatures::laxMixedContentCheckingEnabled() ? ContextTypeOptionallyBlockable : ContextTypeBlockable;
 
     // If we're loading the main resource of a subframe, we need to take a close look at the loaded URL.
@@ skipping 163 matching lines @@
     if (Platform::current()->isReservedIPAddress(resourceIP) && !Platform::current()->isReservedIPAddress(documentIP))
         UseCounter::count(frame->document(), UseCounter::MixedContentPrivateHostnameInPublicHostname);
 }
 
 void MixedContentChecker::trace(Visitor* visitor)
 {
     visitor->trace(m_frame);
 }
 
 } // namespace blink