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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 , m_timelineAgent(timelineAgent) | 68 , m_timelineAgent(timelineAgent) |
69 , m_injectedScriptManager(injectedScriptManager) | 69 , m_injectedScriptManager(injectedScriptManager) |
70 , m_frontend(0) | 70 , m_frontend(0) |
71 , m_expiredConsoleMessageCount(0) | 71 , m_expiredConsoleMessageCount(0) |
72 , m_enabled(false) | 72 , m_enabled(false) |
73 { | 73 { |
74 } | 74 } |
75 | 75 |
76 InspectorConsoleAgent::~InspectorConsoleAgent() | 76 InspectorConsoleAgent::~InspectorConsoleAgent() |
77 { | 77 { |
| 78 #if !ENABLE(OILPAN) |
78 m_instrumentingAgents->setInspectorConsoleAgent(0); | 79 m_instrumentingAgents->setInspectorConsoleAgent(0); |
79 m_instrumentingAgents = 0; | 80 m_instrumentingAgents = nullptr; |
| 81 #endif |
80 m_state = 0; | 82 m_state = 0; |
81 m_injectedScriptManager = 0; | 83 m_injectedScriptManager = 0; |
82 } | 84 } |
83 | 85 |
| 86 void InspectorConsoleAgent::trace(Visitor* visitor) |
| 87 { |
| 88 visitor->trace(m_timelineAgent); |
| 89 InspectorBaseAgent::trace(visitor); |
| 90 } |
| 91 |
84 void InspectorConsoleAgent::init() | 92 void InspectorConsoleAgent::init() |
85 { | 93 { |
86 m_instrumentingAgents->setInspectorConsoleAgent(this); | 94 m_instrumentingAgents->setInspectorConsoleAgent(this); |
87 } | 95 } |
88 | 96 |
89 void InspectorConsoleAgent::enable(ErrorString*) | 97 void InspectorConsoleAgent::enable(ErrorString*) |
90 { | 98 { |
91 if (m_enabled) | 99 if (m_enabled) |
92 return; | 100 return; |
93 m_enabled = true; | 101 m_enabled = true; |
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
330 int m_heapObjectId; | 338 int m_heapObjectId; |
331 }; | 339 }; |
332 | 340 |
333 void InspectorConsoleAgent::addInspectedHeapObject(ErrorString*, int inspectedHe
apObjectId) | 341 void InspectorConsoleAgent::addInspectedHeapObject(ErrorString*, int inspectedHe
apObjectId) |
334 { | 342 { |
335 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n
ew InspectableHeapObject(inspectedHeapObjectId))); | 343 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n
ew InspectableHeapObject(inspectedHeapObjectId))); |
336 } | 344 } |
337 | 345 |
338 } // namespace WebCore | 346 } // namespace WebCore |
339 | 347 |
OLD | NEW |