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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 | 85 |
86 if (callStack) | 86 if (callStack) |
87 InspectorInstrumentation::addMessageToConsole(page, source, LogMessageTy
pe, level, message, callStack, requestIdentifier); | 87 InspectorInstrumentation::addMessageToConsole(page, source, LogMessageTy
pe, level, message, callStack, requestIdentifier); |
88 else | 88 else |
89 InspectorInstrumentation::addMessageToConsole(page, source, LogMessageTy
pe, level, message, url, lineNumber, columnNumber, state, requestIdentifier); | 89 InspectorInstrumentation::addMessageToConsole(page, source, LogMessageTy
pe, level, message, url, lineNumber, columnNumber, state, requestIdentifier); |
90 | 90 |
91 if (source == CSSMessageSource) | 91 if (source == CSSMessageSource) |
92 return; | 92 return; |
93 | 93 |
94 page->chrome().client()->addMessageToConsole(source, level, message, lineNum
ber, url); | 94 page->chrome().client()->addMessageToConsole(source, level, message, lineNum
ber, url); |
| 95 if (page->chrome().client()->shouldReportDetailedMessage(url)) { |
| 96 String jsonStackTrace; |
| 97 if (callStack) { |
| 98 jsonStackTrace = callStack->buildInspectorArray()->toJSONString(); |
| 99 } else { |
| 100 RefPtr<JSONObject> simpleStackFrame = JSONObject::create(); |
| 101 simpleStackFrame->setNumber("lineNumber", lineNumber); |
| 102 simpleStackFrame->setNumber("columnNumber", columnNumber); |
| 103 simpleStackFrame->setString("url", url); |
| 104 RefPtr<JSONArray> simpleStackTrace = JSONArray::create(); |
| 105 simpleStackTrace->pushObject(simpleStackFrame); |
| 106 jsonStackTrace = simpleStackTrace->toJSONString(); |
| 107 } |
| 108 page->chrome().client()->reportDetailedMessage(url, level, message, json
StackTrace); |
| 109 } |
95 } | 110 } |
96 | 111 |
97 // static | 112 // static |
98 void PageConsole::mute() | 113 void PageConsole::mute() |
99 { | 114 { |
100 muteCount++; | 115 muteCount++; |
101 } | 116 } |
102 | 117 |
103 // static | 118 // static |
104 void PageConsole::unmute() | 119 void PageConsole::unmute() |
105 { | 120 { |
106 ASSERT(muteCount > 0); | 121 ASSERT(muteCount > 0); |
107 muteCount--; | 122 muteCount--; |
108 } | 123 } |
109 | 124 |
110 } // namespace WebCore | 125 } // namespace WebCore |
OLD | NEW |