| Index: Source/core/xml/XPathResult.h
|
| diff --git a/Source/core/xml/XPathResult.h b/Source/core/xml/XPathResult.h
|
| index b074bb845d16124f47b8ff36e870e6f1db0611ff..7f8c0475f117f4b6dbbb7e71e10ee3d08af48000 100644
|
| --- a/Source/core/xml/XPathResult.h
|
| +++ b/Source/core/xml/XPathResult.h
|
| @@ -31,7 +31,6 @@
|
| #include "core/xml/XPathValue.h"
|
| #include "platform/heap/Handle.h"
|
| #include "wtf/Forward.h"
|
| -#include "wtf/RefCounted.h"
|
|
|
| namespace blink {
|
|
|
| @@ -43,8 +42,8 @@ namespace XPath {
|
| struct EvaluationContext;
|
| }
|
|
|
| -class XPathResult final : public RefCountedWillBeGarbageCollected<XPathResult>, public ScriptWrappable {
|
| - DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(XPathResult);
|
| +// FIXME: Oilpan: remove Finalized once Document field becomes just a Member<>.
|
| +class XPathResult final : public GarbageCollectedFinalized<XPathResult>, public ScriptWrappable {
|
| DEFINE_WRAPPERTYPEINFO();
|
| public:
|
| enum XPathResultType {
|
| @@ -60,11 +59,14 @@ public:
|
| FIRST_ORDERED_NODE_TYPE = 9
|
| };
|
|
|
| - static PassRefPtrWillBeRawPtr<XPathResult> create(XPath::EvaluationContext& context, const XPath::Value& value)
|
| + static XPathResult* create(XPath::EvaluationContext& context, const XPath::Value& value)
|
| {
|
| - return adoptRefWillBeNoop(new XPathResult(context, value));
|
| + return new XPathResult(context, value);
|
| }
|
|
|
| + ~XPathResult();
|
| + void trace(Visitor*);
|
| +
|
| void convertTo(unsigned short type, ExceptionState&);
|
|
|
| unsigned short resultType() const;
|
| @@ -81,15 +83,13 @@ public:
|
|
|
| const XPath::Value& value() const { return m_value; }
|
|
|
| - void trace(Visitor*);
|
| -
|
| private:
|
| XPathResult(XPath::EvaluationContext&, const XPath::Value&);
|
| XPath::NodeSet& nodeSet() { return *m_nodeSet; }
|
|
|
| XPath::Value m_value;
|
| unsigned m_nodeSetPosition;
|
| - OwnPtrWillBeMember<XPath::NodeSet> m_nodeSet; // FIXME: why duplicate the node set stored in m_value?
|
| + Member<XPath::NodeSet> m_nodeSet; // FIXME: why duplicate the node set stored in m_value?
|
| unsigned short m_resultType;
|
| RefPtrWillBeMember<Document> m_document;
|
| uint64_t m_domTreeVersion;
|
|
|