| 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 , m_timelineAgent(timelineAgent) | 66 , m_timelineAgent(timelineAgent) |
| 67 , m_injectedScriptManager(injectedScriptManager) | 67 , m_injectedScriptManager(injectedScriptManager) |
| 68 , m_frontend(0) | 68 , m_frontend(0) |
| 69 , m_expiredConsoleMessageCount(0) | 69 , m_expiredConsoleMessageCount(0) |
| 70 , m_enabled(false) | 70 , m_enabled(false) |
| 71 { | 71 { |
| 72 } | 72 } |
| 73 | 73 |
| 74 InspectorConsoleAgent::~InspectorConsoleAgent() | 74 InspectorConsoleAgent::~InspectorConsoleAgent() |
| 75 { | 75 { |
| 76 #if !ENABLE(OILPAN) |
| 76 m_instrumentingAgents->setInspectorConsoleAgent(0); | 77 m_instrumentingAgents->setInspectorConsoleAgent(0); |
| 77 m_instrumentingAgents = 0; | 78 m_instrumentingAgents = nullptr; |
| 79 #endif |
| 78 m_state = 0; | 80 m_state = 0; |
| 79 m_injectedScriptManager = 0; | 81 m_injectedScriptManager = 0; |
| 80 } | 82 } |
| 81 | 83 |
| 82 void InspectorConsoleAgent::trace(Visitor* visitor) | 84 void InspectorConsoleAgent::trace(Visitor* visitor) |
| 83 { | 85 { |
| 84 visitor->trace(m_timelineAgent); | 86 visitor->trace(m_timelineAgent); |
| 85 InspectorBaseAgent::trace(visitor); | 87 InspectorBaseAgent::trace(visitor); |
| 86 } | 88 } |
| 87 | 89 |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 331 int m_heapObjectId; | 333 int m_heapObjectId; |
| 332 }; | 334 }; |
| 333 | 335 |
| 334 void InspectorConsoleAgent::addInspectedHeapObject(ErrorString*, int inspectedHe
apObjectId) | 336 void InspectorConsoleAgent::addInspectedHeapObject(ErrorString*, int inspectedHe
apObjectId) |
| 335 { | 337 { |
| 336 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n
ew InspectableHeapObject(inspectedHeapObjectId))); | 338 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n
ew InspectableHeapObject(inspectedHeapObjectId))); |
| 337 } | 339 } |
| 338 | 340 |
| 339 } // namespace WebCore | 341 } // namespace WebCore |
| 340 | 342 |
| OLD | NEW |