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

Side by Side Diff: Source/core/xml/XPathResult.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 unified diff | Download patch
« no previous file with comments | « Source/core/xml/XPathPredicate.cpp ('k') | Source/core/xml/XPathResult.idl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2005 Frerich Raabe <raabe@kde.org> 2 * Copyright (C) 2005 Frerich Raabe <raabe@kde.org>
3 * Copyright (C) 2006, 2009 Apple Inc. All rights reserved. 3 * Copyright (C) 2006, 2009 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 13 matching lines...) Expand all
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #ifndef XPathResult_h 27 #ifndef XPathResult_h
28 #define XPathResult_h 28 #define XPathResult_h
29 29
30 #include "bindings/core/v8/ScriptWrappable.h" 30 #include "bindings/core/v8/ScriptWrappable.h"
31 #include "core/xml/XPathValue.h" 31 #include "core/xml/XPathValue.h"
32 #include "platform/heap/Handle.h" 32 #include "platform/heap/Handle.h"
33 #include "wtf/Forward.h" 33 #include "wtf/Forward.h"
34 #include "wtf/RefCounted.h"
35 34
36 namespace blink { 35 namespace blink {
37 36
38 class Document; 37 class Document;
39 class ExceptionState; 38 class ExceptionState;
40 class Node; 39 class Node;
41 40
42 namespace XPath { 41 namespace XPath {
43 struct EvaluationContext; 42 struct EvaluationContext;
44 } 43 }
45 44
46 class XPathResult final : public RefCountedWillBeGarbageCollected<XPathResult>, public ScriptWrappable { 45 // TODO(Oilpan): remove Finalized when transition type for m_document is.
46 class XPathResult final : public GarbageCollectedFinalized<XPathResult>, public ScriptWrappable {
47 DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(XPathResult); 47 DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(XPathResult);
48 DEFINE_WRAPPERTYPEINFO(); 48 DEFINE_WRAPPERTYPEINFO();
49 public: 49 public:
50 enum XPathResultType { 50 enum XPathResultType {
51 ANY_TYPE = 0, 51 ANY_TYPE = 0,
52 NUMBER_TYPE = 1, 52 NUMBER_TYPE = 1,
53 STRING_TYPE = 2, 53 STRING_TYPE = 2,
54 BOOLEAN_TYPE = 3, 54 BOOLEAN_TYPE = 3,
55 UNORDERED_NODE_ITERATOR_TYPE = 4, 55 UNORDERED_NODE_ITERATOR_TYPE = 4,
56 ORDERED_NODE_ITERATOR_TYPE = 5, 56 ORDERED_NODE_ITERATOR_TYPE = 5,
57 UNORDERED_NODE_SNAPSHOT_TYPE = 6, 57 UNORDERED_NODE_SNAPSHOT_TYPE = 6,
58 ORDERED_NODE_SNAPSHOT_TYPE = 7, 58 ORDERED_NODE_SNAPSHOT_TYPE = 7,
59 ANY_UNORDERED_NODE_TYPE = 8, 59 ANY_UNORDERED_NODE_TYPE = 8,
60 FIRST_ORDERED_NODE_TYPE = 9 60 FIRST_ORDERED_NODE_TYPE = 9
61 }; 61 };
62 62
63 static PassRefPtrWillBeRawPtr<XPathResult> create(XPath::EvaluationContext& context, const XPath::Value& value) 63 static XPathResult* create(XPath::EvaluationContext& context, const XPath::V alue& value)
64 { 64 {
65 return adoptRefWillBeNoop(new XPathResult(context, value)); 65 return new XPathResult(context, value);
66 } 66 }
67 67
68 void convertTo(unsigned short type, ExceptionState&); 68 void convertTo(unsigned short type, ExceptionState&);
69 69
70 unsigned short resultType() const; 70 unsigned short resultType() const;
71 71
72 double numberValue(ExceptionState&) const; 72 double numberValue(ExceptionState&) const;
73 String stringValue(ExceptionState&) const; 73 String stringValue(ExceptionState&) const;
74 bool booleanValue(ExceptionState&) const; 74 bool booleanValue(ExceptionState&) const;
75 Node* singleNodeValue(ExceptionState&) const; 75 Node* singleNodeValue(ExceptionState&) const;
76 76
77 bool invalidIteratorState() const; 77 bool invalidIteratorState() const;
78 unsigned snapshotLength(ExceptionState&) const; 78 unsigned snapshotLength(ExceptionState&) const;
79 Node* iterateNext(ExceptionState&); 79 Node* iterateNext(ExceptionState&);
80 Node* snapshotItem(unsigned index, ExceptionState&); 80 Node* snapshotItem(unsigned index, ExceptionState&);
81 81
82 const XPath::Value& value() const { return m_value; } 82 const XPath::Value& value() const { return m_value; }
83 83
84 DECLARE_TRACE(); 84 DECLARE_TRACE();
85 85
86 private: 86 private:
87 XPathResult(XPath::EvaluationContext&, const XPath::Value&); 87 XPathResult(XPath::EvaluationContext&, const XPath::Value&);
88 XPath::NodeSet& nodeSet() { return *m_nodeSet; } 88 XPath::NodeSet& nodeSet() { return *m_nodeSet; }
89 89
90 XPath::Value m_value; 90 XPath::Value m_value;
91 unsigned m_nodeSetPosition; 91 unsigned m_nodeSetPosition;
92 OwnPtrWillBeMember<XPath::NodeSet> m_nodeSet; // FIXME: why duplicate the no de set stored in m_value? 92 Member<XPath::NodeSet> m_nodeSet; // FIXME: why duplicate the node set store d in m_value?
93 unsigned short m_resultType; 93 unsigned short m_resultType;
94 RefPtrWillBeMember<Document> m_document; 94 RefPtrWillBeMember<Document> m_document;
95 uint64_t m_domTreeVersion; 95 uint64_t m_domTreeVersion;
96 }; 96 };
97 97
98 } // namespace blink 98 } // namespace blink
99 99
100 #endif // XPathResult_h 100 #endif // XPathResult_h
OLDNEW
« no previous file with comments | « Source/core/xml/XPathPredicate.cpp ('k') | Source/core/xml/XPathResult.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698