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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 return debugger->debugger()->addConsoleMessage( | 62 return debugger->debugger()->addConsoleMessage( |
63 debugger->contextGroupId(m_frame), | 63 debugger->contextGroupId(m_frame), |
64 consoleMessage->source(), | 64 consoleMessage->source(), |
65 consoleMessage->level(), | 65 consoleMessage->level(), |
66 consoleMessage->message(), | 66 consoleMessage->message(), |
67 consoleMessage->location()->url(), | 67 consoleMessage->location()->url(), |
68 consoleMessage->location()->lineNumber(), | 68 consoleMessage->location()->lineNumber(), |
69 consoleMessage->location()->columnNumber(), | 69 consoleMessage->location()->columnNumber(), |
70 consoleMessage->location()->cloneStackTrace(), | 70 consoleMessage->location()->cloneStackTrace(), |
71 consoleMessage->location()->scriptId(), | 71 consoleMessage->location()->scriptId(), |
72 IdentifiersFactory::requestId(consoleMessage->requestIdentifier())); | 72 IdentifiersFactory::requestId(consoleMessage->requestIdentifier()), |
| 73 consoleMessage->workerId()); |
73 } | 74 } |
74 | 75 |
75 void FrameConsole::reportMessageToClient(ConsoleMessage* consoleMessage) | 76 void FrameConsole::reportMessageToClient(ConsoleMessage* consoleMessage) |
76 { | 77 { |
77 if (consoleMessage->source() == NetworkMessageSource) | 78 if (consoleMessage->source() == NetworkMessageSource) |
78 return; | 79 return; |
79 | 80 |
80 String url = consoleMessage->location()->url(); | 81 String url = consoleMessage->location()->url(); |
81 String stackTrace; | 82 String stackTrace; |
82 if (consoleMessage->source() == ConsoleAPIMessageSource) { | 83 if (consoleMessage->source() == ConsoleAPIMessageSource) { |
83 if (!frame().host()) | 84 if (!frame().host()) |
84 return; | 85 return; |
85 if (frame().chromeClient().shouldReportDetailedMessageForSource(frame(),
url)) { | 86 if (frame().chromeClient().shouldReportDetailedMessageForSource(frame(),
url)) { |
86 std::unique_ptr<SourceLocation> location = SourceLocation::captureWi
thFullStackTrace(); | 87 std::unique_ptr<SourceLocation> location = SourceLocation::captureWi
thFullStackTrace(); |
87 if (!location->isUnknown()) | 88 if (!location->isUnknown()) |
88 stackTrace = location->toString(); | 89 stackTrace = location->toString(); |
89 } | 90 } |
90 } else { | 91 } else { |
91 if (!consoleMessage->location()->isUnknown() && frame().chromeClient().s
houldReportDetailedMessageForSource(frame(), url)) | 92 if (!consoleMessage->location()->isUnknown() && frame().chromeClient().s
houldReportDetailedMessageForSource(frame(), url)) |
92 stackTrace = consoleMessage->location()->toString(); | 93 stackTrace = consoleMessage->location()->toString(); |
93 } | 94 } |
94 | 95 |
95 frame().chromeClient().addMessageToConsole(m_frame, consoleMessage->source()
, consoleMessage->level(), consoleMessage->message(), consoleMessage->location()
->lineNumber(), url, stackTrace); | 96 frame().chromeClient().addMessageToConsole(m_frame, consoleMessage->source()
, consoleMessage->level(), consoleMessage->message(), consoleMessage->location()
->lineNumber(), url, stackTrace); |
96 } | 97 } |
97 | 98 |
98 void FrameConsole::reportWorkerMessage(ConsoleMessage* consoleMessage) | 99 void FrameConsole::addMessageFromWorker(ConsoleMessage* consoleMessage, const St
ring& workerId) |
99 { | 100 { |
100 reportMessageToClient(consoleMessage); | 101 reportMessageToClient(consoleMessage); |
101 } | 102 addMessageToStorage(ConsoleMessage::createFromWorker(consoleMessage->level()
, consoleMessage->message(), consoleMessage->location() ? consoleMessage->locati
on()->clone() : nullptr, workerId)); |
102 | |
103 void FrameConsole::adoptWorkerMessage(ConsoleMessage* consoleMessage) | |
104 { | |
105 addMessageToStorage(consoleMessage); | |
106 } | 103 } |
107 | 104 |
108 void FrameConsole::reportResourceResponseReceived(DocumentLoader* loader, unsign
ed long requestIdentifier, const ResourceResponse& response) | 105 void FrameConsole::reportResourceResponseReceived(DocumentLoader* loader, unsign
ed long requestIdentifier, const ResourceResponse& response) |
109 { | 106 { |
110 if (!loader) | 107 if (!loader) |
111 return; | 108 return; |
112 if (response.httpStatusCode() < 400) | 109 if (response.httpStatusCode() < 400) |
113 return; | 110 return; |
114 if (response.wasFallbackRequiredByServiceWorker()) | 111 if (response.wasFallbackRequiredByServiceWorker()) |
115 return; | 112 return; |
(...skipping 14 matching lines...) Expand all Loading... |
130 } | 127 } |
131 addMessageToStorage(ConsoleMessage::createForRequest(NetworkMessageSource, E
rrorMessageLevel, message.toString(), error.failingURL(), requestIdentifier)); | 128 addMessageToStorage(ConsoleMessage::createForRequest(NetworkMessageSource, E
rrorMessageLevel, message.toString(), error.failingURL(), requestIdentifier)); |
132 } | 129 } |
133 | 130 |
134 DEFINE_TRACE(FrameConsole) | 131 DEFINE_TRACE(FrameConsole) |
135 { | 132 { |
136 visitor->trace(m_frame); | 133 visitor->trace(m_frame); |
137 } | 134 } |
138 | 135 |
139 } // namespace blink | 136 } // namespace blink |
OLD | NEW |