Chromium Code Reviews| Index: Source/core/inspector/InspectorDOMAgent.h |
| diff --git a/Source/core/inspector/InspectorDOMAgent.h b/Source/core/inspector/InspectorDOMAgent.h |
| index f5174aeaac9be542fad47a5bef046c6bd9387485..1134a5cdf6b54badeaa9e614f66e20a2d3b306c0 100644 |
| --- a/Source/core/inspector/InspectorDOMAgent.h |
| +++ b/Source/core/inspector/InspectorDOMAgent.h |
| @@ -176,7 +176,7 @@ public: |
| void willModifyDOMAttr(Element*, const AtomicString& oldValue, const AtomicString& newValue); |
| void didModifyDOMAttr(Element*, const AtomicString& name, const AtomicString& value); |
| void didRemoveDOMAttr(Element*, const AtomicString& name); |
| - void styleAttributeInvalidated(const Vector<Element*>& elements); |
| + void styleAttributeInvalidated(const WillBeHeapVector<RawPtrWillBeMember<Element> >& elements); |
| void characterDataModified(CharacterData*); |
| void didInvalidateStyleAttr(Node*); |
| void didPushShadowRoot(Element* host, ShadowRoot*); |
| @@ -221,7 +221,7 @@ private: |
| PassOwnPtr<HighlightConfig> highlightConfigFromInspectorObject(ErrorString*, JSONObject* highlightInspectorObject); |
| // Node-related methods. |
| - typedef HashMap<RefPtr<Node>, int> NodeToIdMap; |
| + typedef WillBeHeapHashMap<RefPtrWillBeMember<Node>, int> NodeToIdMap; |
| int bind(Node*, NodeToIdMap*); |
| void unbind(Node*, NodeToIdMap*); |
| @@ -258,16 +258,16 @@ private: |
| InspectorOverlay* m_overlay; |
| InspectorFrontend::DOM* m_frontend; |
| DOMListener* m_domListener; |
| - NodeToIdMap m_documentNodeToIdMap; |
| + OwnPtrWillBePersistent<NodeToIdMap> m_documentNodeToIdMap; |
|
haraken
2014/06/06 07:17:04
I'm curious why you need to change this from NodeT
tkent
2014/06/06 07:59:45
I already explained it in the CL description.
|
| // Owns node mappings for dangling nodes. |
| - Vector<OwnPtr<NodeToIdMap> > m_danglingNodeToIdMaps; |
| - HashMap<int, Node*> m_idToNode; |
| - HashMap<int, NodeToIdMap*> m_idToNodesMap; |
| + WillBePersistentHeapVector<OwnPtrWillBeMember<NodeToIdMap> > m_danglingNodeToIdMaps; |
| + WillBePersistentHeapHashMap<int, RawPtrWillBeMember<Node> > m_idToNode; |
|
haraken
2014/06/06 07:17:04
I don't fully understand this map. Are you sure th
tkent
2014/06/06 07:59:45
This mapped Node is always in m_documentNodeToIdMa
|
| + WillBePersistentHeapHashMap<int, RawPtrWillBeMember<NodeToIdMap> > m_idToNodesMap; |
|
haraken
2014/06/06 07:17:04
Ditto. I couldn't find code to remove entries from
tkent
2014/06/06 07:59:45
Hmm, it seems we should clear m_idToNodesMap in In
yurys
2014/06/06 08:26:00
Looks like a bug to me. We should remove correspon
tkent
2014/06/06 08:26:07
Done.
|
| HashSet<int> m_childrenRequested; |
| HashMap<int, int> m_cachedChildCount; |
| int m_lastNodeId; |
| - RefPtr<Document> m_document; |
| - typedef HashMap<String, Vector<RefPtr<Node> > > SearchResults; |
| + RefPtrWillBePersistent<Document> m_document; |
| + typedef WillBePersistentHeapHashMap<String, WillBeHeapVector<RefPtrWillBeMember<Node> > > SearchResults; |
| SearchResults m_searchResults; |
| OwnPtr<RevalidateStyleAttributeTask> m_revalidateStyleAttrTask; |
| SearchMode m_searchingForNode; |