| Index: Source/core/xml/XPathStep.h
|
| diff --git a/Source/core/xml/XPathStep.h b/Source/core/xml/XPathStep.h
|
| index 0b649866471e5c046079dc1bc38aef3cc8f5f3bc..7af718fcacdf84a009925f69ffb97c8d29887fc5 100644
|
| --- a/Source/core/xml/XPathStep.h
|
| +++ b/Source/core/xml/XPathStep.h
|
| @@ -81,8 +81,8 @@ public:
|
| Kind kind() const { return m_kind; }
|
| const AtomicString& data() const { return m_data; }
|
| const AtomicString& namespaceURI() const { return m_namespaceURI; }
|
| - WillBeHeapVector<OwnPtrWillBeMember<Predicate> >& mergedPredicates() { return m_mergedPredicates; }
|
| - const WillBeHeapVector<OwnPtrWillBeMember<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;
|
| @@ -90,11 +90,11 @@ public:
|
| AtomicString m_namespaceURI;
|
|
|
| // When possible, we merge some or all predicates with node test for better performance.
|
| - WillBeHeapVector<OwnPtrWillBeMember<Predicate> > m_mergedPredicates;
|
| + WillBeHeapVector<OwnPtrWillBeMember<Predicate>> m_mergedPredicates;
|
| };
|
|
|
| Step(Axis, const NodeTest&);
|
| - Step(Axis, const NodeTest&, WillBeHeapVector<OwnPtrWillBeMember<Predicate> >&);
|
| + Step(Axis, const NodeTest&, WillBeHeapVector<OwnPtrWillBeMember<Predicate>>&);
|
| virtual ~Step();
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| @@ -116,7 +116,7 @@ private:
|
|
|
| Axis m_axis;
|
| OwnPtrWillBeMember<NodeTest> m_nodeTest;
|
| - WillBeHeapVector<OwnPtrWillBeMember<Predicate> > m_predicates;
|
| + WillBeHeapVector<OwnPtrWillBeMember<Predicate>> m_predicates;
|
| };
|
|
|
| void optimizeStepPair(Step*, Step*, bool& dropSecondStep);
|
|
|