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 29 matching lines...) Expand all Loading... |
40 namespace blink { | 40 namespace blink { |
41 | 41 |
42 PageConsoleAgent::PageConsoleAgent(InjectedScriptManager* injectedScriptManager,
InspectorDOMAgent* domAgent, InspectorTimelineAgent* timelineAgent) | 42 PageConsoleAgent::PageConsoleAgent(InjectedScriptManager* injectedScriptManager,
InspectorDOMAgent* domAgent, InspectorTimelineAgent* timelineAgent) |
43 : InspectorConsoleAgent(timelineAgent, injectedScriptManager) | 43 : InspectorConsoleAgent(timelineAgent, injectedScriptManager) |
44 , m_inspectorDOMAgent(domAgent) | 44 , m_inspectorDOMAgent(domAgent) |
45 { | 45 { |
46 } | 46 } |
47 | 47 |
48 PageConsoleAgent::~PageConsoleAgent() | 48 PageConsoleAgent::~PageConsoleAgent() |
49 { | 49 { |
50 m_inspectorDOMAgent = 0; | 50 #if !ENABLE(OILPAN) |
| 51 m_inspectorDOMAgent = nullptr; |
| 52 #endif |
| 53 } |
| 54 |
| 55 void PageConsoleAgent::trace(Visitor* visitor) |
| 56 { |
| 57 visitor->trace(m_inspectorDOMAgent); |
| 58 InspectorConsoleAgent::trace(visitor); |
51 } | 59 } |
52 | 60 |
53 void PageConsoleAgent::clearMessages(ErrorString* errorString) | 61 void PageConsoleAgent::clearMessages(ErrorString* errorString) |
54 { | 62 { |
55 m_inspectorDOMAgent->releaseDanglingNodes(); | 63 m_inspectorDOMAgent->releaseDanglingNodes(); |
56 InspectorConsoleAgent::clearMessages(errorString); | 64 InspectorConsoleAgent::clearMessages(errorString); |
57 } | 65 } |
58 | 66 |
59 class InspectableNode FINAL : public InjectedScriptHost::InspectableObject { | 67 class InspectableNode FINAL : public InjectedScriptHost::InspectableObject { |
60 public: | 68 public: |
(...skipping 17 matching lines...) Expand all Loading... |
78 Node& ancestor = node->highestAncestorOrSelf(); | 86 Node& ancestor = node->highestAncestorOrSelf(); |
79 if (!ancestor.isShadowRoot() || toShadowRoot(ancestor).type() == ShadowR
oot::AuthorShadowRoot) | 87 if (!ancestor.isShadowRoot() || toShadowRoot(ancestor).type() == ShadowR
oot::AuthorShadowRoot) |
80 break; | 88 break; |
81 // User agent shadow root, keep climbing up. | 89 // User agent shadow root, keep climbing up. |
82 node = toShadowRoot(ancestor).host(); | 90 node = toShadowRoot(ancestor).host(); |
83 } | 91 } |
84 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n
ew InspectableNode(node))); | 92 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n
ew InspectableNode(node))); |
85 } | 93 } |
86 | 94 |
87 } // namespace blink | 95 } // namespace blink |
OLD | NEW |