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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 String messageURL; | 74 String messageURL; |
75 unsigned lineNumber = 0; | 75 unsigned lineNumber = 0; |
76 if (consoleMessage->callStack()) { | 76 if (consoleMessage->callStack()) { |
77 lineNumber = consoleMessage->callStack()->at(0).lineNumber(); | 77 lineNumber = consoleMessage->callStack()->at(0).lineNumber(); |
78 messageURL = consoleMessage->callStack()->at(0).sourceURL(); | 78 messageURL = consoleMessage->callStack()->at(0).sourceURL(); |
79 } else { | 79 } else { |
80 lineNumber = consoleMessage->lineNumber(); | 80 lineNumber = consoleMessage->lineNumber(); |
81 messageURL = consoleMessage->url(); | 81 messageURL = consoleMessage->url(); |
82 } | 82 } |
83 | 83 |
84 RefPtr<ScriptCallStack> reportedCallStack; | 84 RefPtrWillBeRawPtr<ScriptCallStack> reportedCallStack = nullptr; |
85 if (consoleMessage->source() != ConsoleAPIMessageSource) { | 85 if (consoleMessage->source() != ConsoleAPIMessageSource) { |
86 if (consoleMessage->callStack() && m_frame.chromeClient().shouldReportDe
tailedMessageForSource(messageURL)) | 86 if (consoleMessage->callStack() && m_frame.chromeClient().shouldReportDe
tailedMessageForSource(messageURL)) |
87 reportedCallStack = consoleMessage->callStack(); | 87 reportedCallStack = consoleMessage->callStack(); |
88 } else { | 88 } else { |
89 if (!m_frame.host() || (consoleMessage->scriptArguments() && consoleMess
age->scriptArguments()->argumentCount() == 0)) | 89 if (!m_frame.host() || (consoleMessage->scriptArguments() && consoleMess
age->scriptArguments()->argumentCount() == 0)) |
90 return; | 90 return; |
91 | 91 |
92 MessageType type = consoleMessage->type(); | 92 MessageType type = consoleMessage->type(); |
93 if (type == StartGroupMessageType || type == EndGroupMessageType || type
== StartGroupCollapsedMessageType) | 93 if (type == StartGroupMessageType || type == EndGroupMessageType || type
== StartGroupCollapsedMessageType) |
94 return; | 94 return; |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 ASSERT(muteCount > 0); | 131 ASSERT(muteCount > 0); |
132 muteCount--; | 132 muteCount--; |
133 } | 133 } |
134 | 134 |
135 void FrameConsole::adoptWorkerConsoleMessages(WorkerGlobalScopeProxy* proxy) | 135 void FrameConsole::adoptWorkerConsoleMessages(WorkerGlobalScopeProxy* proxy) |
136 { | 136 { |
137 InspectorInstrumentation::adoptWorkerConsoleMessages(m_frame.document(), pro
xy); | 137 InspectorInstrumentation::adoptWorkerConsoleMessages(m_frame.document(), pro
xy); |
138 } | 138 } |
139 | 139 |
140 } // namespace blink | 140 } // namespace blink |
OLD | NEW |