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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 void FrameConsole::addMessage(ConsoleMessage* consoleMessage) | 50 void FrameConsole::addMessage(ConsoleMessage* consoleMessage) |
51 { | 51 { |
52 if (addMessageToStorage(consoleMessage)) | 52 if (addMessageToStorage(consoleMessage)) |
53 reportMessageToClient(consoleMessage); | 53 reportMessageToClient(consoleMessage); |
54 } | 54 } |
55 | 55 |
56 bool FrameConsole::addMessageToStorage(ConsoleMessage* consoleMessage) | 56 bool FrameConsole::addMessageToStorage(ConsoleMessage* consoleMessage) |
57 { | 57 { |
58 if (!m_frame->document() || !m_frame->host()) | 58 if (!m_frame->document() || !m_frame->host()) |
59 return false; | 59 return false; |
60 return m_frame->host()->consoleMessageStorage().addConsoleMessage(m_frame->d
ocument(), consoleMessage); | 60 m_frame->host()->consoleMessageStorage().addConsoleMessage(m_frame->document
(), consoleMessage); |
| 61 return true; |
61 } | 62 } |
62 | 63 |
63 void FrameConsole::reportMessageToClient(ConsoleMessage* consoleMessage) | 64 void FrameConsole::reportMessageToClient(ConsoleMessage* consoleMessage) |
64 { | 65 { |
65 if (consoleMessage->source() == NetworkMessageSource) | 66 if (consoleMessage->source() == NetworkMessageSource) |
66 return; | 67 return; |
67 | 68 |
68 String url = consoleMessage->location()->url(); | 69 String url = consoleMessage->location()->url(); |
69 String stackTrace; | 70 String stackTrace; |
70 if (consoleMessage->source() == ConsoleAPIMessageSource) { | 71 if (consoleMessage->source() == ConsoleAPIMessageSource) { |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
114 } | 115 } |
115 addMessageToStorage(ConsoleMessage::createForRequest(NetworkMessageSource, E
rrorMessageLevel, message.toString(), error.failingURL(), requestIdentifier)); | 116 addMessageToStorage(ConsoleMessage::createForRequest(NetworkMessageSource, E
rrorMessageLevel, message.toString(), error.failingURL(), requestIdentifier)); |
116 } | 117 } |
117 | 118 |
118 DEFINE_TRACE(FrameConsole) | 119 DEFINE_TRACE(FrameConsole) |
119 { | 120 { |
120 visitor->trace(m_frame); | 121 visitor->trace(m_frame); |
121 } | 122 } |
122 | 123 |
123 } // namespace blink | 124 } // namespace blink |
OLD | NEW |