Chromium Code Reviews| Index: Source/core/xml/XPathResult.h |
| diff --git a/Source/core/xml/XPathResult.h b/Source/core/xml/XPathResult.h |
| index c55a6f6b328a6094f6991b81c7f3d2625e2a4a46..41f50601e91230892686e9fb538a6dec471b361d 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); |
|
tkent
2015/04/27 08:08:35
Should we keep this macro?
sof
2015/04/27 09:13:04
Could do that, as the dtor will be trivial with EN
|
| +// TODO(Oilpan): remove Finalized when transition type for m_document is. |
| +class XPathResult final : public GarbageCollectedFinalized<XPathResult>, public ScriptWrappable { |
| DEFINE_WRAPPERTYPEINFO(); |
| public: |
| enum XPathResultType { |
| @@ -60,11 +59,13 @@ 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 convertTo(unsigned short type, ExceptionState&); |
| unsigned short resultType() const; |
| @@ -89,7 +90,7 @@ private: |
| 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; |