Add `disposition` to SecurityPolicyViolationEvent

third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp

Index: third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp
diff --git a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp
index 0c5577dcbfec8109a8dd7e6d14fb4965ff989401..617384e90947edfa5af65598bf325da754bac70e 100644
--- a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp
+++ b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp
@@ -837,7 +837,7 @@ static String stripURLForUseInReport(Document* document, const KURL& url, Redire
     return SecurityOrigin::create(url)->toString();
 }
 
-static void gatherSecurityPolicyViolationEventData(SecurityPolicyViolationEventInit& init, Document* document, const String& directiveText, const String& effectiveDirective, const KURL& blockedURL, const String& header, RedirectStatus redirectStatus, ContentSecurityPolicy::ViolationType violationType, int contextLine)
+static void gatherSecurityPolicyViolationEventData(SecurityPolicyViolationEventInit& init, Document* document, const String& directiveText, ContentSecurityPolicy::DispositionType dispositionType, const String& effectiveDirective, const KURL& blockedURL, const String& header, RedirectStatus redirectStatus, ContentSecurityPolicy::ViolationType violationType, int contextLine)
 {
     if (equalIgnoringCase(effectiveDirective, ContentSecurityPolicy::FrameAncestors)) {
         // If this load was blocked via 'frame-ancestors', then the URL of |document| has not yet
@@ -863,6 +863,14 @@ static void gatherSecurityPolicyViolationEventData(SecurityPolicyViolationEventI
     init.setViolatedDirective(directiveText);
     init.setEffectiveDirective(effectiveDirective);
     init.setOriginalPolicy(header);
+    switch (dispositionType) {
+    case ContentSecurityPolicy::Enforce:
+        init.setDisposition("enforce");
+        break;
+    case ContentSecurityPolicy::Report:
+        init.setDisposition("report");
+        break;
+    }
     init.setSourceFile(String());
     init.setLineNumber(contextLine);
     init.setColumnNumber(0);
@@ -880,7 +888,7 @@ static void gatherSecurityPolicyViolationEventData(SecurityPolicyViolationEventI
     }
 }
 
-void ContentSecurityPolicy::reportViolation(const String& directiveText, const String& effectiveDirective, const String& consoleMessage, const KURL& blockedURL, const Vector<String>& reportEndpoints, const String& header, ViolationType violationType, LocalFrame* contextFrame, RedirectStatus redirectStatus, int contextLine)
+void ContentSecurityPolicy::reportViolation(const String& directiveText, DispositionType dispositionType, const String& effectiveDirective, const String& consoleMessage, const KURL& blockedURL, const Vector<String>& reportEndpoints, const String& header, ViolationType violationType, LocalFrame* contextFrame, RedirectStatus redirectStatus, int contextLine)
 {
     ASSERT(violationType == URLViolation || blockedURL.isEmpty());
 
@@ -902,7 +910,7 @@ void ContentSecurityPolicy::reportViolation(const String& directiveText, const S
         return;
 
     SecurityPolicyViolationEventInit violationData;
-    gatherSecurityPolicyViolationEventData(violationData, document, directiveText, effectiveDirective, blockedURL, header, redirectStatus, violationType, contextLine);
+    gatherSecurityPolicyViolationEventData(violationData, document, directiveText, dispositionType, effectiveDirective, blockedURL, header, redirectStatus, violationType, contextLine);
 
     // TODO(mkwst): Obviously, we shouldn't hit this check, as extension-loaded
     // resources should be allowed regardless. We apparently do, however, so
@@ -927,6 +935,7 @@ void ContentSecurityPolicy::reportViolation(const String& directiveText, const S
     cspReport->setString("violated-directive", violationData.violatedDirective());
     cspReport->setString("effective-directive", violationData.effectiveDirective());
     cspReport->setString("original-policy", violationData.originalPolicy());
+    cspReport->setString("disposition", violationData.disposition());
     cspReport->setString("blocked-uri", violationData.blockedURI());
     if (violationData.lineNumber())
         cspReport->setInteger("line-number", violationData.lineNumber());