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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 InspectorConsoleAgent::~InspectorConsoleAgent() | 56 InspectorConsoleAgent::~InspectorConsoleAgent() |
57 { | 57 { |
58 #if !ENABLE(OILPAN) | 58 #if !ENABLE(OILPAN) |
59 m_instrumentingAgents->setInspectorConsoleAgent(0); | 59 m_instrumentingAgents->setInspectorConsoleAgent(0); |
60 #endif | 60 #endif |
61 } | 61 } |
62 | 62 |
63 DEFINE_TRACE(InspectorConsoleAgent) | 63 DEFINE_TRACE(InspectorConsoleAgent) |
64 { | 64 { |
65 visitor->trace(m_injectedScriptManager); | 65 visitor->trace(m_injectedScriptManager); |
66 visitor->trace(m_debuggerAgent); | |
67 InspectorBaseAgent::trace(visitor); | 66 InspectorBaseAgent::trace(visitor); |
68 } | 67 } |
69 | 68 |
70 void InspectorConsoleAgent::enable(ErrorString*) | 69 void InspectorConsoleAgent::enable(ErrorString*) |
71 { | 70 { |
72 if (m_enabled) | 71 if (m_enabled) |
73 return; | 72 return; |
74 m_instrumentingAgents->setInspectorConsoleAgent(this); | 73 m_instrumentingAgents->setInspectorConsoleAgent(this); |
75 m_enabled = true; | 74 m_enabled = true; |
76 enableStackCapturingIfNeeded(); | 75 enableStackCapturingIfNeeded(); |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
234 } | 233 } |
235 if (consoleMessage->messageId()) | 234 if (consoleMessage->messageId()) |
236 jsonObj->setMessageId(consoleMessage->messageId()); | 235 jsonObj->setMessageId(consoleMessage->messageId()); |
237 if (consoleMessage->relatedMessageId()) | 236 if (consoleMessage->relatedMessageId()) |
238 jsonObj->setRelatedMessageId(consoleMessage->relatedMessageId()); | 237 jsonObj->setRelatedMessageId(consoleMessage->relatedMessageId()); |
239 frontend()->messageAdded(jsonObj); | 238 frontend()->messageAdded(jsonObj); |
240 frontend()->flush(); | 239 frontend()->flush(); |
241 } | 240 } |
242 | 241 |
243 } // namespace blink | 242 } // namespace blink |
OLD | NEW |