Chromium Code Reviews| 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_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 #if !ENABLE(OILPAN) |
| 77 m_instrumentingAgents->setInspectorConsoleAgent(0); | 77 m_instrumentingAgents->setInspectorConsoleAgent(0); |
| 78 m_instrumentingAgents = nullptr; | 78 m_instrumentingAgents = nullptr; |
|
yurys
2014/07/26 04:28:15
I don't think lines 78-79 make much sense, it shou
keishi
2014/07/28 08:36:46
Done.
| |
| 79 m_injectedScriptManager = nullptr; | |
| 79 #endif | 80 #endif |
| 80 m_state = 0; | |
| 81 m_injectedScriptManager = 0; | |
| 82 } | 81 } |
| 83 | 82 |
| 84 void InspectorConsoleAgent::trace(Visitor* visitor) | 83 void InspectorConsoleAgent::trace(Visitor* visitor) |
| 85 { | 84 { |
| 86 visitor->trace(m_timelineAgent); | 85 visitor->trace(m_timelineAgent); |
| 86 visitor->trace(m_injectedScriptManager); | |
| 87 InspectorBaseAgent::trace(visitor); | 87 InspectorBaseAgent::trace(visitor); |
| 88 } | 88 } |
| 89 | 89 |
| 90 void InspectorConsoleAgent::init() | 90 void InspectorConsoleAgent::init() |
| 91 { | 91 { |
| 92 m_instrumentingAgents->setInspectorConsoleAgent(this); | 92 m_instrumentingAgents->setInspectorConsoleAgent(this); |
| 93 } | 93 } |
| 94 | 94 |
| 95 void InspectorConsoleAgent::enable(ErrorString*) | 95 void InspectorConsoleAgent::enable(ErrorString*) |
| 96 { | 96 { |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 333 int m_heapObjectId; | 333 int m_heapObjectId; |
| 334 }; | 334 }; |
| 335 | 335 |
| 336 void InspectorConsoleAgent::addInspectedHeapObject(ErrorString*, int inspectedHe apObjectId) | 336 void InspectorConsoleAgent::addInspectedHeapObject(ErrorString*, int inspectedHe apObjectId) |
| 337 { | 337 { |
| 338 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n ew InspectableHeapObject(inspectedHeapObjectId))); | 338 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n ew InspectableHeapObject(inspectedHeapObjectId))); |
| 339 } | 339 } |
| 340 | 340 |
| 341 } // namespace blink | 341 } // namespace blink |
| 342 | 342 |
| OLD | NEW |