CSP: Don't override the location set in reportViolationWithLocation.

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

 /*
  * Copyright (C) 2011 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 11 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef ContentSecurityPolicy_h
 #define ContentSecurityPolicy_h
 
 #include <memory>
 #include <utility>
 #include "bindings/core/v8/ScriptState.h"
+#include "bindings/core/v8/SourceLocation.h"
 #include "core/CoreExport.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/SecurityContext.h"
 #include "core/inspector/ConsoleTypes.h"
 #include "platform/heap/Handle.h"
 #include "platform/loader/fetch/Resource.h"
 #include "platform/loader/fetch/ResourceRequest.h"
 #include "platform/network/ContentSecurityPolicyParsers.h"
 #include "platform/network/HTTPParsers.h"
 #include "platform/weborigin/SchemeRegistry.h"
@@ skipping 15 matching lines @@
 class ConsoleMessage;
 class CSPDirectiveList;
 class CSPSource;
 class Document;
 class Element;
 class LocalFrameClient;
 class KURL;
 class ResourceRequest;
 class SecurityOrigin;
 class SecurityPolicyViolationEventInit;
+class SourceLocation;
 
 typedef int SandboxFlags;
 typedef HeapVector<Member<CSPDirectiveList>> CSPDirectiveListVector;
 typedef HeapVector<Member<ConsoleMessage>> ConsoleMessageVector;
 typedef std::pair<String, ContentSecurityPolicyHeaderType> CSPHeaderAndType;
 using RedirectStatus = ResourceRequest::RedirectStatus;
 
 class CORE_EXPORT ContentSecurityPolicy
     : public GarbageCollectedFinalized<ContentSecurityPolicy> {
  public:
@@ skipping 245 matching lines @@
   void reportInvalidDirectiveInMeta(const String& directiveName);
   void reportReportOnlyInMeta(const String&);
   void reportMetaOutsideHead(const String&);
   void reportValueForEmptyDirective(const String& directiveName,
                                     const String& value);
 
   // If a frame is passed in, the report will be sent using it as a context. If
   // no frame is passed in, the report will be sent via this object's
   // |m_executionContext| (or dropped on the floor if no such context is
   // available).
+  // If |sourceLocation| is not set, the source location will be the context's
+  // current location.
   void reportViolation(const String& directiveText,
                        const DirectiveType& effectiveType,
                        const String& consoleMessage,
                        const KURL& blockedURL,
                        const Vector<String>& reportEndpoints,
                        const String& header,
                        ContentSecurityPolicyHeaderType,
                        ViolationType,
+                       std::unique_ptr<SourceLocation>,
                        LocalFrame* = nullptr,
                        RedirectStatus = RedirectStatus::FollowedRedirect,
-                       int contextLine = 0,
                        Element* = nullptr,
                        const String& source = emptyString);
 
   // Called when mixed content is detected on a page; will trigger a violation
   // report if the 'block-all-mixed-content' directive is specified for a
   // policy.
   void reportMixedContent(const KURL& mixedURL, RedirectStatus);
 
   void reportBlockedScriptExecutionToInspector(
       const String& directiveText) const;
@@ skipping 90 matching lines @@
   String m_disableEvalErrorMessage;
   WebInsecureRequestPolicy m_insecureRequestPolicy;
 
   Member<CSPSource> m_selfSource;
   String m_selfProtocol;
 };
 
 }  // namespace blink
 
 #endif