Changeset 116904 in webkit


Ignore:
Timestamp:
May 13, 2012 4:25:04 PM (12 years ago)
Author:
Darin Adler
Message:

Dangling node to ID maps vector uses raw pointers, but should use OwnPtr
https://bugs.webkit.org/show_bug.cgi?id=86299

Reviewed by Pavel Feldman.

  • inspector/InspectorDOMAgent.cpp:

(WebCore::InspectorDOMAgent::releaseDanglingNodes): Removed now-unneeded call
to deleteAllValues since the clear function now takes care of that.
(WebCore::InspectorDOMAgent::pushNodePathToFrontend): Added code that uses
adoptPtr and release as neeed to deal with a Vector<OwnPtr>.

  • inspector/InspectorDOMAgent.h: Changed m_danglingNodeToIdMaps to be

Vector<OwnPtr> instead of a vector of raw pointers.

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r116900 r116904  
     12012-05-13  Darin Adler  <darin@apple.com>
     2
     3        Dangling node to ID maps vector uses raw pointers, but should use OwnPtr
     4        https://bugs.webkit.org/show_bug.cgi?id=86299
     5
     6        Reviewed by Pavel Feldman.
     7
     8        * inspector/InspectorDOMAgent.cpp:
     9        (WebCore::InspectorDOMAgent::releaseDanglingNodes): Removed now-unneeded call
     10        to deleteAllValues since the clear function now takes care of that.
     11        (WebCore::InspectorDOMAgent::pushNodePathToFrontend): Added code that uses
     12        adoptPtr and release as neeed to deal with a Vector<OwnPtr>.
     13        * inspector/InspectorDOMAgent.h: Changed m_danglingNodeToIdMaps to be
     14        Vector<OwnPtr> instead of a vector of raw pointers.
     15
    1162012-05-13  Victor Carbune  <vcarbune@adobe.com>
    217
  • trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp

    r116755 r116904  
    308308void InspectorDOMAgent::releaseDanglingNodes()
    309309{
    310     deleteAllValues(m_danglingNodeToIdMaps);
    311310    m_danglingNodeToIdMaps.clear();
    312311}
     
    533532        if (!parent) {
    534533            // Node being pushed is detached -> push subtree root.
    535             danglingMap = new NodeToIdMap();
    536             m_danglingNodeToIdMaps.append(danglingMap);
     534            OwnPtr<NodeToIdMap> newMap = adoptPtr(new NodeToIdMap);
     535            danglingMap = newMap.get();
     536            m_danglingNodeToIdMaps.append(newMap.release());
    537537            RefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node> > children = TypeBuilder::Array<TypeBuilder::DOM::Node>::create();
    538538            children->addItem(buildObjectForNode(node, 0, danglingMap));
  • trunk/Source/WebCore/inspector/InspectorDOMAgent.h

    r113783 r116904  
    245245    NodeToIdMap m_documentNodeToIdMap;
    246246    // Owns node mappings for dangling nodes.
    247     Vector<NodeToIdMap*> m_danglingNodeToIdMaps;
     247    Vector<OwnPtr<NodeToIdMap> > m_danglingNodeToIdMaps;
    248248    HashMap<int, Node*> m_idToNode;
    249249    HashMap<int, NodeToIdMap*> m_idToNodesMap;
Note: See TracChangeset for help on using the changeset viewer.