Enable Oilpan for core/xml/

Source/core/xml/XPathPath.cpp

 /*
  * Copyright (C) 2005 Frerich Raabe <raabe@kde.org>
  * Copyright (C) 2006, 2009 Apple Inc.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 19 matching lines @@
 
 #include "core/dom/Document.h"
 #include "core/dom/NodeTraversal.h"
 #include "core/xml/XPathPredicate.h"
 #include "core/xml/XPathStep.h"
 #include "core/xml/XPathValue.h"
 
 namespace blink {
 namespace XPath {
 
-Filter::Filter(PassOwnPtrWillBeRawPtr<Expression> expr, WillBeHeapVector<OwnPtrWillBeMember<Predicate> >& predicates)
+Filter::Filter(Expression* expr, HeapVector<Member<Predicate> >& predicates)
     : m_expr(expr)
 {
     m_predicates.swap(predicates);
     setIsContextNodeSensitive(m_expr->isContextNodeSensitive());
     setIsContextPositionSensitive(m_expr->isContextPositionSensitive());
     setIsContextSizeSensitive(m_expr->isContextSizeSensitive());
 }
 
 Filter::~Filter()
 {
 }
 
 void Filter::trace(Visitor* visitor)
 {
     visitor->trace(m_expr);
     visitor->trace(m_predicates);
     Expression::trace(visitor);
 }
 
 Value Filter::evaluate(EvaluationContext& evaluationContext) const
 {
     Value v = m_expr->evaluate(evaluationContext);
 
     NodeSet& nodes = v.modifiableNodeSet(evaluationContext);
     nodes.sort();
 
     for (unsigned i = 0; i < m_predicates.size(); i++) {
-        OwnPtrWillBeRawPtr<NodeSet> newNodes(NodeSet::create());
+        NodeSet* newNodes = NodeSet::create();
         evaluationContext.size = nodes.size();
         evaluationContext.position = 0;
 
         for (unsigned j = 0; j < nodes.size(); j++) {
             Node* node = nodes[j];
 
             evaluationContext.node = node;
             ++evaluationContext.position;
 
             if (m_predicates[i]->evaluate(evaluationContext))
                 newNodes->append(node);
         }
         nodes.swap(*newNodes);
     }
 
     return v;
 }
 
 LocationPath::LocationPath()
     : m_absolute(false)
 {
     setIsContextNodeSensitive(true);
 }
 
 LocationPath::~LocationPath()
 {
-#if !ENABLE(OILPAN)
-    deleteAllValues(m_steps);
-#endif
 }
 
 void LocationPath::trace(Visitor* visitor)
 {
-#if ENABLE(OILPAN)
     visitor->trace(m_steps);
-#endif
     Expression::trace(visitor);
 }
 
 Value LocationPath::evaluate(EvaluationContext& evaluationContext) const
 {
     EvaluationContext clonedContext = evaluationContext;
     // http://www.w3.org/TR/xpath/
     // Section 2, Location Paths:
     // "/ selects the document root (which is always the parent of the document element)"
     // "A / by itself selects the root node of the document containing the context node."
     // In the case of a tree that is detached from the document, we violate
     // the spec and treat / as the root node of the detached tree.
     // This is for compatibility with Firefox, and also seems like a more
     // logical treatment of where you would expect the "root" to be.
     Node* context = evaluationContext.node.get();
     if (m_absolute && context->nodeType() != Node::DOCUMENT_NODE)  {
         if (context->inDocument())
             context = context->ownerDocument();
         else
             context = &NodeTraversal::highestAncestorOrSelf(*context);
     }
 
-    OwnPtrWillBeRawPtr<NodeSet> nodes(NodeSet::create());
+    NodeSet* nodes = NodeSet::create();
     nodes->append(context);
     evaluate(clonedContext, *nodes);
 
-    return Value(nodes.release(), Value::adopt);
+    return Value(nodes, Value::adopt);
 }
 
 void LocationPath::evaluate(EvaluationContext& context, NodeSet& nodes) const
 {
     bool resultIsSorted = nodes.isSorted();
 
     for (unsigned i = 0; i < m_steps.size(); i++) {
         Step* step = m_steps[i];
-        OwnPtrWillBeRawPtr<NodeSet> newNodes(NodeSet::create());
+        NodeSet* newNodes = NodeSet::create();
         WillBeHeapHashSet<RawPtrWillBeMember<Node> > newNodesSet;
 
         bool needToCheckForDuplicateNodes = !nodes.subtreesAreDisjoint() || (step->axis() != Step::ChildAxis && step->axis() != Step::SelfAxis
             && step->axis() != Step::DescendantAxis && step->axis() != Step::DescendantOrSelfAxis && step->axis() != Step::AttributeAxis);
 
         if (needToCheckForDuplicateNodes)
             resultIsSorted = false;
 
         // This is a simplified check that can be improved to handle more cases.
         if (nodes.subtreesAreDisjoint() && (step->axis() == Step::ChildAxis || step->axis() == Step::SelfAxis))
             newNodes->markSubtreesDisjoint(true);
 
         for (unsigned j = 0; j < nodes.size(); j++) {
-            OwnPtrWillBeRawPtr<NodeSet> matches(NodeSet::create());
+            NodeSet* matches = NodeSet::create();
             step->evaluate(context, nodes[j], *matches);
 
             if (!matches->isSorted())
                 resultIsSorted = false;
 
             for (size_t nodeIndex = 0; nodeIndex < matches->size(); ++nodeIndex) {
                 Node* node = (*matches)[nodeIndex];
                 if (!needToCheckForDuplicateNodes || newNodesSet.add(node).isNewEntry)
                     newNodes->append(node);
             }
         }
 
         nodes.swap(*newNodes);
     }
 
     nodes.markSorted(resultIsSorted);
 }
 
 void LocationPath::appendStep(Step* step)
 {
     unsigned stepCount = m_steps.size();
-    if (stepCount) {
-        bool dropSecondStep;
-        optimizeStepPair(m_steps[stepCount - 1], step, dropSecondStep);
-        if (dropSecondStep) {
-#if !ENABLE(OILPAN)
-            delete step;
-#endif
-            return;
-        }
-    }
+    if (stepCount && optimizeStepPair(m_steps[stepCount - 1], step))
+        return;
     step->optimize();
     m_steps.append(step);
 }
 
 void LocationPath::insertFirstStep(Step* step)
 {
-    if (m_steps.size()) {
-        bool dropSecondStep;
-        optimizeStepPair(step, m_steps[0], dropSecondStep);
-        if (dropSecondStep) {
-#if !ENABLE(OILPAN)
-            delete m_steps[0];
-#endif
-            m_steps[0] = step;
-            return;
-        }
+    if (m_steps.size() && optimizeStepPair(step, m_steps[0])) {
+        m_steps[0] = step;
+        return;
     }
     step->optimize();
     m_steps.insert(0, step);
 }
 
 Path::Path(Expression* filter, LocationPath* path)
-    : m_filter(adoptPtrWillBeNoop(filter))
-    , m_path(adoptPtrWillBeNoop(path))
+    : m_filter(filter)
+    , m_path(path)
 {
     setIsContextNodeSensitive(filter->isContextNodeSensitive());
     setIsContextPositionSensitive(filter->isContextPositionSensitive());
     setIsContextSizeSensitive(filter->isContextSizeSensitive());
 }
 
 Path::~Path()
 {
 }
 
 void Path::trace(Visitor* visitor)
 {
     visitor->trace(m_filter);
     visitor->trace(m_path);
     Expression::trace(visitor);
 }
 
 Value Path::evaluate(EvaluationContext& context) const
 {
     Value v = m_filter->evaluate(context);
 
     NodeSet& nodes = v.modifiableNodeSet(context);
     m_path->evaluate(context, nodes);
 
     return v;
 }
 
-}
-}
+} // namespace XPath
+
+} // namespace blink