| Index: Source/core/xml/XPathExpression.h
|
| diff --git a/Source/core/xml/XPathExpression.h b/Source/core/xml/XPathExpression.h
|
| index f33e1458b1ae89631d19165dd14419650e5cf628..dc6dd694caf847bad9e963cc06eb1b2ea5dfe405 100644
|
| --- a/Source/core/xml/XPathExpression.h
|
| +++ b/Source/core/xml/XPathExpression.h
|
| @@ -44,24 +44,23 @@ namespace XPath {
|
| class Expression;
|
| }
|
|
|
| -class XPathExpression : public RefCountedWillBeGarbageCollected<XPathExpression>, public ScriptWrappable {
|
| - DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(XPathExpression);
|
| +class XPathExpression : public GarbageCollected<XPathExpression>, public ScriptWrappable {
|
| DEFINE_WRAPPERTYPEINFO();
|
| public:
|
| - static PassRefPtrWillBeRawPtr<XPathExpression> create()
|
| + static XPathExpression* create()
|
| {
|
| - return adoptRefWillBeNoop(new XPathExpression);
|
| + return new XPathExpression;
|
| }
|
|
|
| - static PassRefPtrWillBeRawPtr<XPathExpression> createExpression(const String& expression, PassRefPtrWillBeRawPtr<XPathNSResolver>, ExceptionState&);
|
| - PassRefPtrWillBeRawPtr<XPathResult> evaluate(Node* contextNode, unsigned short type, XPathResult*, ExceptionState&);
|
| + static XPathExpression* createExpression(const String& expression, XPathNSResolver*, ExceptionState&);
|
| + XPathResult* evaluate(Node* contextNode, unsigned short type, XPathResult*, ExceptionState&);
|
|
|
| void trace(Visitor*);
|
|
|
| private:
|
| XPathExpression();
|
|
|
| - OwnPtrWillBeMember<XPath::Expression> m_topExpression;
|
| + Member<XPath::Expression> m_topExpression;
|
| };
|
|
|
| } // namespace blink
|
|
|