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

Unified Diff: Source/core/xml/XPathValue.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/XPathStep.cpp ('k') | Source/core/xml/XPathValue.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/xml/XPathValue.h
diff --git a/Source/core/xml/XPathValue.h b/Source/core/xml/XPathValue.h
index 5382f22f9c209fb0ef31a851c1ebdfd384420dd4..50a8432373124845dfe4a848205db2c4653f540f 100644
--- a/Source/core/xml/XPathValue.h
+++ b/Source/core/xml/XPathValue.h
@@ -36,12 +36,12 @@ namespace XPath {
struct EvaluationContext;
-class ValueData : public RefCountedWillBeGarbageCollectedFinalized<ValueData> {
+class ValueData : public GarbageCollectedFinalized<ValueData> {
public:
- static PassRefPtrWillBeRawPtr<ValueData> create() { return adoptRefWillBeNoop(new ValueData); }
- static PassRefPtrWillBeRawPtr<ValueData> create(const NodeSet& nodeSet) { return adoptRefWillBeNoop(new ValueData(nodeSet)); }
- static PassRefPtrWillBeRawPtr<ValueData> create(PassOwnPtrWillBeRawPtr<NodeSet> nodeSet) { return adoptRefWillBeNoop(new ValueData(nodeSet)); }
- static PassRefPtrWillBeRawPtr<ValueData> create(const String& string) { return adoptRefWillBeNoop(new ValueData(string)); }
+ static ValueData* create() { return new ValueData; }
+ static ValueData* create(const NodeSet& nodeSet) { return new ValueData(nodeSet); }
+ static ValueData* create(NodeSet* nodeSet) { return new ValueData(nodeSet); }
+ static ValueData* create(const String& string) { return new ValueData(string); }
DECLARE_TRACE();
NodeSet& nodeSet() { return *m_nodeSet; }
@@ -50,10 +50,10 @@ public:
private:
ValueData() : m_nodeSet(NodeSet::create()) { }
explicit ValueData(const NodeSet& nodeSet) : m_nodeSet(NodeSet::create(nodeSet)) { }
- explicit ValueData(PassOwnPtrWillBeRawPtr<NodeSet> nodeSet) : m_nodeSet(nodeSet) { }
+ explicit ValueData(NodeSet* nodeSet) : m_nodeSet(nodeSet) { }
explicit ValueData(const String& string) : m_string(string), m_nodeSet(NodeSet::create()) { }
- OwnPtrWillBeMember<NodeSet> m_nodeSet;
+ Member<NodeSet> m_nodeSet;
};
// Copying Value objects makes their data partially shared, so care has to be taken when dealing with copies.
@@ -77,7 +77,7 @@ public:
template<typename T> Value(T);
static const struct AdoptTag { } adopt;
- Value(PassOwnPtrWillBeRawPtr<NodeSet> value, const AdoptTag&) : m_type(NodeSetValue), m_bool(false), m_number(0), m_data(ValueData::create(value)) { }
+ Value(NodeSet* value, const AdoptTag&) : m_type(NodeSetValue), m_bool(false), m_number(0), m_data(ValueData::create(value)) { }
Type type() const { return m_type; }
@@ -98,7 +98,7 @@ private:
Type m_type;
bool m_bool;
double m_number;
- RefPtrWillBeMember<ValueData> m_data;
+ Member<ValueData> m_data;
};
template<>
@@ -109,7 +109,8 @@ inline Value::Value(bool value)
{
}
-}
+} // namespace XPath
+
+} // namespace blink
-}
#endif // XPathValue_h
« no previous file with comments | « Source/core/xml/XPathStep.cpp ('k') | Source/core/xml/XPathValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698