| 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 { | 56 { |
| 57 #if !ENABLE(OILPAN) | 57 #if !ENABLE(OILPAN) |
| 58 m_inspectorDOMAgent = nullptr; | 58 m_inspectorDOMAgent = nullptr; |
| 59 m_instrumentingAgents->setPageConsoleAgent(nullptr); | 59 m_instrumentingAgents->setPageConsoleAgent(nullptr); |
| 60 #endif | 60 #endif |
| 61 } | 61 } |
| 62 | 62 |
| 63 DEFINE_TRACE(PageConsoleAgent) | 63 DEFINE_TRACE(PageConsoleAgent) |
| 64 { | 64 { |
| 65 visitor->trace(m_inspectorDOMAgent); | 65 visitor->trace(m_inspectorDOMAgent); |
| 66 visitor->trace(m_inspectedFrames); |
| 66 InspectorConsoleAgent::trace(visitor); | 67 InspectorConsoleAgent::trace(visitor); |
| 67 } | 68 } |
| 68 | 69 |
| 69 void PageConsoleAgent::enable(ErrorString* errorString) | 70 void PageConsoleAgent::enable(ErrorString* errorString) |
| 70 { | 71 { |
| 71 InspectorConsoleAgent::enable(errorString); | 72 InspectorConsoleAgent::enable(errorString); |
| 72 m_workersWithEnabledConsole.clear(); | 73 m_workersWithEnabledConsole.clear(); |
| 73 m_instrumentingAgents->setPageConsoleAgent(this); | 74 m_instrumentingAgents->setPageConsoleAgent(this); |
| 74 } | 75 } |
| 75 | 76 |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 ++s_enabledAgentCount; | 125 ++s_enabledAgentCount; |
| 125 } | 126 } |
| 126 | 127 |
| 127 void PageConsoleAgent::disableStackCapturingIfNeeded() | 128 void PageConsoleAgent::disableStackCapturingIfNeeded() |
| 128 { | 129 { |
| 129 if (!(--s_enabledAgentCount)) | 130 if (!(--s_enabledAgentCount)) |
| 130 ScriptController::setCaptureCallStackForUncaughtExceptions(false); | 131 ScriptController::setCaptureCallStackForUncaughtExceptions(false); |
| 131 } | 132 } |
| 132 | 133 |
| 133 } // namespace blink | 134 } // namespace blink |
| OLD | NEW |