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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 { | 49 { |
50 m_inspectorDOMAgent = 0; | 50 m_inspectorDOMAgent = 0; |
51 } | 51 } |
52 | 52 |
53 void PageConsoleAgent::clearMessages(ErrorString* errorString) | 53 void PageConsoleAgent::clearMessages(ErrorString* errorString) |
54 { | 54 { |
55 m_inspectorDOMAgent->releaseDanglingNodes(); | 55 m_inspectorDOMAgent->releaseDanglingNodes(); |
56 InspectorConsoleAgent::clearMessages(errorString); | 56 InspectorConsoleAgent::clearMessages(errorString); |
57 } | 57 } |
58 | 58 |
59 class InspectableNode : public InjectedScriptHost::InspectableObject { | 59 class InspectableNode FINAL : public InjectedScriptHost::InspectableObject { |
60 public: | 60 public: |
61 explicit InspectableNode(Node* node) : m_node(node) { } | 61 explicit InspectableNode(Node* node) : m_node(node) { } |
62 virtual ScriptValue get(ScriptState* state) | 62 virtual ScriptValue get(ScriptState* state) OVERRIDE |
63 { | 63 { |
64 return InjectedScriptHost::nodeAsScriptValue(state, m_node); | 64 return InjectedScriptHost::nodeAsScriptValue(state, m_node); |
65 } | 65 } |
66 private: | 66 private: |
67 Node* m_node; | 67 Node* m_node; |
68 }; | 68 }; |
69 | 69 |
70 void PageConsoleAgent::addInspectedNode(ErrorString* errorString, int nodeId) | 70 void PageConsoleAgent::addInspectedNode(ErrorString* errorString, int nodeId) |
71 { | 71 { |
72 Node* node = m_inspectorDOMAgent->nodeForId(nodeId); | 72 Node* node = m_inspectorDOMAgent->nodeForId(nodeId); |
73 if (!node) { | 73 if (!node) { |
74 *errorString = "nodeId is not valid"; | 74 *errorString = "nodeId is not valid"; |
75 return; | 75 return; |
76 } | 76 } |
77 while (node->isInShadowTree()) { | 77 while (node->isInShadowTree()) { |
78 Node* ancestor = node->highestAncestor(); | 78 Node* ancestor = node->highestAncestor(); |
79 if (!ancestor->isShadowRoot() || toShadowRoot(ancestor)->type() == Shado
wRoot::AuthorShadowRoot) | 79 if (!ancestor->isShadowRoot() || toShadowRoot(ancestor)->type() == Shado
wRoot::AuthorShadowRoot) |
80 break; | 80 break; |
81 // User agent shadow root, keep climbing up. | 81 // User agent shadow root, keep climbing up. |
82 node = toShadowRoot(ancestor)->host(); | 82 node = toShadowRoot(ancestor)->host(); |
83 } | 83 } |
84 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n
ew InspectableNode(node))); | 84 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n
ew InspectableNode(node))); |
85 } | 85 } |
86 | 86 |
87 } // namespace WebCore | 87 } // namespace WebCore |
OLD | NEW |