#include "core/xml/XPathExpressionNode.h"
#include "core/xml/XPathNodeSet.h"
-namespace WebCore {
+namespace blink {
class Node;
class Step FINAL : public ParseNode {
WTF_MAKE_NONCOPYABLE(Step);
- WTF_MAKE_FAST_ALLOCATED;
+ WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
public:
enum Axis {
AncestorAxis, AncestorOrSelfAxis, AttributeAxis,
SelfAxis
};
- class NodeTest {
- WTF_MAKE_FAST_ALLOCATED;
+ class NodeTest : public NoBaseWillBeGarbageCollectedFinalized<NodeTest> {
+ WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
public:
enum Kind {
TextNodeTest, CommentNodeTest, ProcessingInstructionNodeTest, AnyNodeTest, NameTest
ASSERT(o.m_mergedPredicates.isEmpty());
return *this;
}
+ void trace(Visitor* visitor) { visitor->trace(m_mergedPredicates); }
Kind kind() const { return m_kind; }
const AtomicString& data() const { return m_data; }
const AtomicString& namespaceURI() const { return m_namespaceURI; }
- Vector<OwnPtr<Predicate> >& mergedPredicates() { return m_mergedPredicates; }
- const Vector<OwnPtr<Predicate> >& mergedPredicates() const { return m_mergedPredicates; }
+ WillBeHeapVector<OwnPtrWillBeMember<Predicate> >& mergedPredicates() { return m_mergedPredicates; }
+ const WillBeHeapVector<OwnPtrWillBeMember<Predicate> >& mergedPredicates() const { return m_mergedPredicates; }
private:
Kind m_kind;
AtomicString m_namespaceURI;
// When possible, we merge some or all predicates with node test for better performance.
- Vector<OwnPtr<Predicate> > m_mergedPredicates;
+ WillBeHeapVector<OwnPtrWillBeMember<Predicate> > m_mergedPredicates;
};
Step(Axis, const NodeTest&);
- Step(Axis, const NodeTest&, Vector<OwnPtr<Predicate> >&);
+ Step(Axis, const NodeTest&, WillBeHeapVector<OwnPtrWillBeMember<Predicate> >&);
virtual ~Step();
+ virtual void trace(Visitor*) OVERRIDE;
void optimize();
- void evaluate(Node* context, NodeSet&) const;
+ void evaluate(EvaluationContext&, Node* context, NodeSet&) const;
Axis axis() const { return m_axis; }
- const NodeTest& nodeTest() const { return m_nodeTest; }
+ const NodeTest& nodeTest() const { return *m_nodeTest; }
private:
friend void optimizeStepPair(Step*, Step*, bool&);
bool predicatesAreContextListInsensitive() const;
+ NodeTest& nodeTest() { return *m_nodeTest; }
void parseNodeTest(const String&);
- void nodesInAxis(Node* context, NodeSet&) const;
+ void nodesInAxis(EvaluationContext&, Node* context, NodeSet&) const;
String namespaceFromNodetest(const String& nodeTest) const;
Axis m_axis;
- NodeTest m_nodeTest;
- Vector<OwnPtr<Predicate> > m_predicates;
+ OwnPtrWillBeMember<NodeTest> m_nodeTest;
+ WillBeHeapVector<OwnPtrWillBeMember<Predicate> > m_predicates;
};
void optimizeStepPair(Step*, Step*, bool& dropSecondStep);
} // namespace XPath
-} // namespace WebCore
+} // namespace blink
#endif // XPathStep_h