Distinguish between subresource filtering and dryrun matching.

third_party/WebKit/Source/core/loader/FrameFetchContext.cpp

 /*
  * Copyright (C) 2013 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 801 matching lines @@
           ? MixedContentChecker::SuppressReport
           : MixedContentChecker::SendReport;
   if (MixedContentChecker::shouldBlockFetch(frame(), resourceRequest, url,
                                             mixedContentReporting))
     return ResourceRequestBlockedReason::MixedContent;
 
   // Let the client have the final say into whether or not the load should
   // proceed.
   DocumentLoader* documentLoader = masterDocumentLoader();
   if (documentLoader && documentLoader->subresourceFilter() &&
-      type != Resource::MainResource && type != Resource::ImportResource &&
-      !documentLoader->subresourceFilter()->allowLoad(
-          url, resourceRequest.requestContext()))
-    return ResourceRequestBlockedReason::SubresourceFilter;
+      type != Resource::MainResource && type != Resource::ImportResource) {
+    WebDocumentSubresourceFilter::LoadPolicy loadPolicy =
+        documentLoader->subresourceFilter()->getLoadPolicy(
+            url, resourceRequest.requestContext());
+    if (reportingPolicy == SecurityViolationReportingPolicy::Report) {
+      switch (loadPolicy) {
+        case WebDocumentSubresourceFilter::Allow:
+          break;
+        case WebDocumentSubresourceFilter::Disallow:
+          documentLoader->subresourceFilter()->reportDisallowedLoad();
+        // fall through
+        case WebDocumentSubresourceFilter::WouldDisallow:
+          documentLoader->didObserveLoadingBehavior(
+              WebLoadingBehaviorSubresourceFilterMatch);
+          break;
+      }
+    }
+    if (loadPolicy == WebDocumentSubresourceFilter::Disallow)
+      return ResourceRequestBlockedReason::SubresourceFilter;
+  }
 
   return ResourceRequestBlockedReason::None;
 }
 
 bool FrameFetchContext::isControlledByServiceWorker() const {
   DCHECK(m_documentLoader || frame()->loader().documentLoader());
 
   // Service workers are bypassed by suborigins (see
   // https://w3c.github.io/webappsec-suborigins/). Since service worker
   // controllers are assigned based on physical origin, without knowledge of
@@ skipping 253 matching lines @@
                                                     response);
 }
 
 DEFINE_TRACE(FrameFetchContext) {
   visitor->trace(m_document);
   visitor->trace(m_documentLoader);
   FetchContext::trace(visitor);
 }
 
 }  // namespace blink