PlzNavigate & CSP. Use the SourceLocation in violation reports.

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

 /*
  * Copyright (C) 2009 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 2068 matching lines @@
   FrameLoader& frameloader = frame()->loader();
   DCHECK(frameloader.provisionalDocumentLoader());
   frameloader.loadFailed(frameloader.provisionalDocumentLoader(), error);
   return true;
 }
 
 // Called when a navigation is blocked because a Content Security Policy (CSP)
 // is infringed.
 void WebLocalFrameImpl::reportContentSecurityPolicyViolation(
     const blink::WebContentSecurityPolicyViolation& violation) {
+  addMessageToConsole(blink::WebConsoleMessage(
+      WebConsoleMessage::LevelError, violation.consoleMessage,
+      violation.sourceLocation.url, violation.sourceLocation.lineNumber,
+      violation.sourceLocation.columnNumber));
+
+  std::unique_ptr<SourceLocation> sourceLocation = SourceLocation::create(
+      violation.sourceLocation.url, violation.sourceLocation.lineNumber,
+      violation.sourceLocation.columnNumber, nullptr);
+
   DCHECK(frame() && frame()->document());
   Document* document = frame()->document();
   Vector<String> reportEndpoints;
   for (const WebString& endPoint : violation.reportEndpoints)
     reportEndpoints.push_back(endPoint);
   document->contentSecurityPolicy()->reportViolation(
       violation.directive, /* directiveText */
       ContentSecurityPolicy::getDirectiveType(
           violation.effectiveDirective), /* effectiveType */
       violation.consoleMessage,          /* consoleMessage */
       violation.blockedUrl,              /* blockedUrl */
       reportEndpoints,                   /* reportEndpoints */
       violation.header,                  /* header */
       static_cast<ContentSecurityPolicyHeaderType>(violation.disposition),
       ContentSecurityPolicy::ViolationType::URLViolation, /* ViolationType */
-      nullptr,                                            /* LocalFrame */
+      std::move(sourceLocation), nullptr,                 /* LocalFrame */
       violation.afterRedirect ? RedirectStatus::FollowedRedirect
                               : RedirectStatus::NoRedirect,
-      // TODO(arthursonzogni, clamy) Provide the context line number here.
-      // See http://crbug.com/690946
-      0,        /* contextLine */
       nullptr); /* Element */
 }
 
 bool WebLocalFrameImpl::isLoading() const {
   if (!frame() || !frame()->document())
     return false;
   return frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument() ||
          frame()->loader().hasProvisionalNavigation() ||
          !frame()->document()->loadEventFinished();
 }
@@ skipping 383 matching lines @@
         createMarkup(startPosition, endPosition, AnnotateForInterchange,
                      ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
   } else {
     clipHtml =
         createMarkup(endPosition, startPosition, AnnotateForInterchange,
                      ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
   }
 }
 
 }  // namespace blink