| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google 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 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageTyp
e type, MessageLevel level, const String& message, ScriptState* scriptState, Scr
iptArguments* arguments, unsigned long requestIdentifier) | 168 void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageTyp
e type, MessageLevel level, const String& message, ScriptState* scriptState, Scr
iptArguments* arguments, unsigned long requestIdentifier) |
| 169 { | 169 { |
| 170 if (type == ClearMessageType) { | 170 if (type == ClearMessageType) { |
| 171 ErrorString error; | 171 ErrorString error; |
| 172 clearMessages(&error); | 172 clearMessages(&error); |
| 173 } | 173 } |
| 174 | 174 |
| 175 addConsoleMessage(adoptPtr(new ConsoleMessage(!isWorkerAgent(), source, type
, level, message, arguments, scriptState, requestIdentifier))); | 175 addConsoleMessage(adoptPtr(new ConsoleMessage(!isWorkerAgent(), source, type
, level, message, arguments, scriptState, requestIdentifier))); |
| 176 } | 176 } |
| 177 | 177 |
| 178 void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageTyp
e type, MessageLevel level, const String& message, const String& scriptId, unsig
ned lineNumber, unsigned columnNumber, ScriptCallStack* callStack, ScriptState*
scriptState, unsigned long requestIdentifier) |
| 179 { |
| 180 if (type == ClearMessageType) { |
| 181 ErrorString error; |
| 182 clearMessages(&error); |
| 183 } |
| 184 |
| 185 addConsoleMessage(adoptPtr(new ConsoleMessage(!isWorkerAgent(), source, type
, level, message, scriptId, lineNumber, columnNumber, callStack, scriptState, re
questIdentifier))); |
| 186 } |
| 187 |
| 178 void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageTyp
e type, MessageLevel level, const String& message, const String& scriptId, unsig
ned lineNumber, unsigned columnNumber, ScriptState* scriptState, unsigned long r
equestIdentifier) | 188 void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageTyp
e type, MessageLevel level, const String& message, const String& scriptId, unsig
ned lineNumber, unsigned columnNumber, ScriptState* scriptState, unsigned long r
equestIdentifier) |
| 179 { | 189 { |
| 180 if (type == ClearMessageType) { | 190 if (type == ClearMessageType) { |
| 181 ErrorString error; | 191 ErrorString error; |
| 182 clearMessages(&error); | 192 clearMessages(&error); |
| 183 } | 193 } |
| 184 | 194 |
| 185 bool canGenerateCallStack = !isWorkerAgent() && m_frontend; | 195 bool canGenerateCallStack = !isWorkerAgent() && m_frontend; |
| 186 addConsoleMessage(adoptPtr(new ConsoleMessage(canGenerateCallStack, source,
type, level, message, scriptId, lineNumber, columnNumber, scriptState, requestId
entifier))); | 196 addConsoleMessage(adoptPtr(new ConsoleMessage(canGenerateCallStack, source,
type, level, message, scriptId, lineNumber, columnNumber, scriptState, requestId
entifier))); |
| 187 } | 197 } |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 326 int m_heapObjectId; | 336 int m_heapObjectId; |
| 327 }; | 337 }; |
| 328 | 338 |
| 329 void InspectorConsoleAgent::addInspectedHeapObject(ErrorString*, int inspectedHe
apObjectId) | 339 void InspectorConsoleAgent::addInspectedHeapObject(ErrorString*, int inspectedHe
apObjectId) |
| 330 { | 340 { |
| 331 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n
ew InspectableHeapObject(inspectedHeapObjectId))); | 341 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n
ew InspectableHeapObject(inspectedHeapObjectId))); |
| 332 } | 342 } |
| 333 | 343 |
| 334 } // namespace WebCore | 344 } // namespace WebCore |
| 335 | 345 |
| OLD | NEW |