Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(761)

Unified Diff: Source/core/xml/XPathExpression.h

Issue 1099613003: Oilpan: have xml/ objects on the heap by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: simplify XPathResult dtor Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/xml/XPathEvaluator.idl ('k') | Source/core/xml/XPathExpression.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/xml/XPathExpression.h
diff --git a/Source/core/xml/XPathExpression.h b/Source/core/xml/XPathExpression.h
index 90869e2aba9e4636845febe485ba0f2034c97e37..5fbfca15126592a249c1aedaa6005d0848615cdf 100644
--- a/Source/core/xml/XPathExpression.h
+++ b/Source/core/xml/XPathExpression.h
@@ -30,8 +30,6 @@
#include "bindings/core/v8/ScriptWrappable.h"
#include "platform/heap/Handle.h"
#include "wtf/Forward.h"
-#include "wtf/PassRefPtr.h"
-#include "wtf/RefCounted.h"
namespace blink {
@@ -45,24 +43,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, const ScriptValue&, ExceptionState&);
+ static XPathExpression* createExpression(const String& expression, XPathNSResolver*, ExceptionState&);
+ XPathResult* evaluate(Node* contextNode, unsigned short type, const ScriptValue&, ExceptionState&);
DECLARE_TRACE();
private:
XPathExpression();
- OwnPtrWillBeMember<XPath::Expression> m_topExpression;
+ Member<XPath::Expression> m_topExpression;
};
} // namespace blink
« no previous file with comments | « Source/core/xml/XPathEvaluator.idl ('k') | Source/core/xml/XPathExpression.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698