PlzNavigate: preserve SourceLocation when navigating

third_party/WebKit/Source/core/frame/FrameConsole.cpp

 /*
  * Copyright (C) 2013 Apple 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 10 matching lines @@
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/frame/FrameConsole.h"
 
+#include <memory>
 #include "bindings/core/v8/SourceLocation.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/LocalFrame.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/ConsoleMessageStorage.h"
 #include "core/inspector/MainThreadDebugger.h"
+#include "core/loader/DocumentLoader.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/Page.h"
 #include "platform/network/ResourceError.h"
 #include "platform/network/ResourceResponse.h"
 #include "wtf/text/StringBuilder.h"
-#include <memory>
 
 namespace blink {
 
 FrameConsole::FrameConsole(LocalFrame& frame) : m_frame(&frame) {}
 
 void FrameConsole::addMessage(ConsoleMessage* consoleMessage) {
+  // PlzNavigate: when trying to commit a navigation, the SourceLocation
+  // information for how the request was triggered has been stored in the
+  // provisional DocumentLoader. Use it instead.
+  DocumentLoader* provisionalLoader =
+      m_frame->loader().provisionalDocumentLoader();
+  if (provisionalLoader) {
+    std::unique_ptr<SourceLocation> sourceLocation =
+        provisionalLoader->copySourceLocation();
+    if (sourceLocation) {
+      consoleMessage = ConsoleMessage::create(
+          consoleMessage->source(), consoleMessage->level(),
+          consoleMessage->message(), std::move(sourceLocation));
+    }
+  }
+
   if (addMessageToStorage(consoleMessage))
     reportMessageToClient(consoleMessage->source(), consoleMessage->level(),
                           consoleMessage->message(),
                           consoleMessage->location());
 }
 
 bool FrameConsole::addMessageToStorage(ConsoleMessage* consoleMessage) {
   if (!m_frame->document() || !m_frame->host())
     return false;
   m_frame->host()->consoleMessageStorage().addConsoleMessage(
@@ skipping 81 matching lines @@
   addMessageToStorage(ConsoleMessage::createForRequest(
       NetworkMessageSource, ErrorMessageLevel, message.toString(),
       error.failingURL(), requestIdentifier));
 }
 
 DEFINE_TRACE(FrameConsole) {
   visitor->trace(m_frame);
 }
 
 }  // namespace blink