| Index: Source/core/xml/XPathPath.h
|
| diff --git a/Source/core/xml/XPathPath.h b/Source/core/xml/XPathPath.h
|
| index d8a3af042d03b249942390996777f54d4ac3dd0e..57ba46ba4500df54530d3c6d34b7ad7adf6fe750 100644
|
| --- a/Source/core/xml/XPathPath.h
|
| +++ b/Source/core/xml/XPathPath.h
|
| @@ -39,7 +39,7 @@ class Step;
|
|
|
| class Filter final : public Expression {
|
| public:
|
| - Filter(PassOwnPtrWillBeRawPtr<Expression>, WillBeHeapVector<OwnPtrWillBeMember<Predicate> >&);
|
| + Filter(Expression*, HeapVector<Member<Predicate> >&);
|
| virtual ~Filter();
|
| virtual void trace(Visitor*) override;
|
|
|
| @@ -48,8 +48,8 @@ public:
|
| private:
|
| virtual Value::Type resultType() const override { return Value::NodeSetValue; }
|
|
|
| - OwnPtrWillBeMember<Expression> m_expr;
|
| - WillBeHeapVector<OwnPtrWillBeMember<Predicate> > m_predicates;
|
| + Member<Expression> m_expr;
|
| + HeapVector<Member<Predicate> > m_predicates;
|
| };
|
|
|
| class LocationPath final : public Expression {
|
| @@ -67,7 +67,7 @@ public:
|
| private:
|
| virtual Value::Type resultType() const override { return Value::NodeSetValue; }
|
|
|
| - WillBeHeapVector<RawPtrWillBeMember<Step> > m_steps;
|
| + HeapVector<Member<Step> > m_steps;
|
| bool m_absolute;
|
| };
|
|
|
| @@ -82,8 +82,8 @@ public:
|
| private:
|
| virtual Value::Type resultType() const override { return Value::NodeSetValue; }
|
|
|
| - OwnPtrWillBeMember<Expression> m_filter;
|
| - OwnPtrWillBeMember<LocationPath> m_path;
|
| + Member<Expression> m_filter;
|
| + Member<LocationPath> m_path;
|
| };
|
|
|
| }
|
|
|