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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 } | 119 } |
120 | 120 |
121 void InspectorConsoleAgent::disable(ErrorString*) | 121 void InspectorConsoleAgent::disable(ErrorString*) |
122 { | 122 { |
123 if (!m_enabled) | 123 if (!m_enabled) |
124 return; | 124 return; |
125 m_enabled = false; | 125 m_enabled = false; |
126 if (!(--s_enabledAgentCount)) | 126 if (!(--s_enabledAgentCount)) |
127 ScriptController::setCaptureCallStackForUncaughtExceptions(false); | 127 ScriptController::setCaptureCallStackForUncaughtExceptions(false); |
128 m_state->setBoolean(ConsoleAgentState::consoleMessagesEnabled, false); | 128 m_state->setBoolean(ConsoleAgentState::consoleMessagesEnabled, false); |
| 129 m_state->setBoolean(ConsoleAgentState::tracingBasedTimeline, false); |
129 } | 130 } |
130 | 131 |
131 void InspectorConsoleAgent::clearMessages(ErrorString*) | 132 void InspectorConsoleAgent::clearMessages(ErrorString*) |
132 { | 133 { |
133 m_consoleMessages.clear(); | 134 m_consoleMessages.clear(); |
134 m_expiredConsoleMessageCount = 0; | 135 m_expiredConsoleMessageCount = 0; |
135 m_injectedScriptManager->releaseObjectGroup("console"); | 136 m_injectedScriptManager->releaseObjectGroup("console"); |
136 if (m_frontend && m_enabled) | 137 if (m_frontend && m_enabled) |
137 m_frontend->messagesCleared(); | 138 m_frontend->messagesCleared(); |
138 } | 139 } |
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
343 private: | 344 private: |
344 int m_heapObjectId; | 345 int m_heapObjectId; |
345 }; | 346 }; |
346 | 347 |
347 void InspectorConsoleAgent::addInspectedHeapObject(ErrorString*, int inspectedHe
apObjectId) | 348 void InspectorConsoleAgent::addInspectedHeapObject(ErrorString*, int inspectedHe
apObjectId) |
348 { | 349 { |
349 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n
ew InspectableHeapObject(inspectedHeapObjectId))); | 350 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n
ew InspectableHeapObject(inspectedHeapObjectId))); |
350 } | 351 } |
351 | 352 |
352 } // namespace blink | 353 } // namespace blink |
OLD | NEW |