OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Apple Inc. All rights reserved. | 2 * Copyright (C) 2013 Apple Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 10 matching lines...) Expand all Loading... |
21 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 21 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 */ | 27 */ |
28 | 28 |
29 #include "core/frame/FrameConsole.h" | 29 #include "core/frame/FrameConsole.h" |
30 | 30 |
| 31 #include <memory> |
31 #include "bindings/core/v8/SourceLocation.h" | 32 #include "bindings/core/v8/SourceLocation.h" |
32 #include "core/frame/FrameHost.h" | 33 #include "core/frame/FrameHost.h" |
33 #include "core/frame/LocalFrame.h" | 34 #include "core/frame/LocalFrame.h" |
34 #include "core/inspector/ConsoleMessage.h" | 35 #include "core/inspector/ConsoleMessage.h" |
35 #include "core/inspector/ConsoleMessageStorage.h" | 36 #include "core/inspector/ConsoleMessageStorage.h" |
36 #include "core/inspector/MainThreadDebugger.h" | 37 #include "core/inspector/MainThreadDebugger.h" |
| 38 #include "core/loader/DocumentLoader.h" |
37 #include "core/page/ChromeClient.h" | 39 #include "core/page/ChromeClient.h" |
38 #include "core/page/Page.h" | 40 #include "core/page/Page.h" |
39 #include "platform/network/ResourceError.h" | 41 #include "platform/network/ResourceError.h" |
40 #include "platform/network/ResourceResponse.h" | 42 #include "platform/network/ResourceResponse.h" |
41 #include "wtf/text/StringBuilder.h" | 43 #include "wtf/text/StringBuilder.h" |
42 #include <memory> | |
43 | 44 |
44 namespace blink { | 45 namespace blink { |
45 | 46 |
46 FrameConsole::FrameConsole(LocalFrame& frame) : m_frame(&frame) {} | 47 FrameConsole::FrameConsole(LocalFrame& frame) : m_frame(&frame) {} |
47 | 48 |
48 void FrameConsole::addMessage(ConsoleMessage* consoleMessage) { | 49 void FrameConsole::addMessage(ConsoleMessage* consoleMessage) { |
| 50 // PlzNavigate: when trying to commit a navigation, the SourceLocation |
| 51 // information for how the request was triggered has been stored in the |
| 52 // provisional DocumentLoader. Use it instead. |
| 53 DocumentLoader* provisionalLoader = |
| 54 m_frame->loader().provisionalDocumentLoader(); |
| 55 if (provisionalLoader) { |
| 56 std::unique_ptr<SourceLocation> sourceLocation = |
| 57 provisionalLoader->copySourceLocation(); |
| 58 if (sourceLocation) { |
| 59 consoleMessage = ConsoleMessage::create( |
| 60 consoleMessage->source(), consoleMessage->level(), |
| 61 consoleMessage->message(), std::move(sourceLocation)); |
| 62 } |
| 63 } |
| 64 |
49 if (addMessageToStorage(consoleMessage)) | 65 if (addMessageToStorage(consoleMessage)) |
50 reportMessageToClient(consoleMessage->source(), consoleMessage->level(), | 66 reportMessageToClient(consoleMessage->source(), consoleMessage->level(), |
51 consoleMessage->message(), | 67 consoleMessage->message(), |
52 consoleMessage->location()); | 68 consoleMessage->location()); |
53 } | 69 } |
54 | 70 |
55 bool FrameConsole::addMessageToStorage(ConsoleMessage* consoleMessage) { | 71 bool FrameConsole::addMessageToStorage(ConsoleMessage* consoleMessage) { |
56 if (!m_frame->document() || !m_frame->host()) | 72 if (!m_frame->document() || !m_frame->host()) |
57 return false; | 73 return false; |
58 m_frame->host()->consoleMessageStorage().addConsoleMessage( | 74 m_frame->host()->consoleMessageStorage().addConsoleMessage( |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 addMessageToStorage(ConsoleMessage::createForRequest( | 156 addMessageToStorage(ConsoleMessage::createForRequest( |
141 NetworkMessageSource, ErrorMessageLevel, message.toString(), | 157 NetworkMessageSource, ErrorMessageLevel, message.toString(), |
142 error.failingURL(), requestIdentifier)); | 158 error.failingURL(), requestIdentifier)); |
143 } | 159 } |
144 | 160 |
145 DEFINE_TRACE(FrameConsole) { | 161 DEFINE_TRACE(FrameConsole) { |
146 visitor->trace(m_frame); | 162 visitor->trace(m_frame); |
147 } | 163 } |
148 | 164 |
149 } // namespace blink | 165 } // namespace blink |
OLD | NEW |