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

Side by Side Diff: third_party/WebKit/Source/core/dom/SelectorQuery.h

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
3 * Copyright (C) 2014 Samsung Electronics. All rights reserved. 3 * Copyright (C) 2014 Samsung Electronics. 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 14 matching lines...) Expand all
25 */ 25 */
26 26
27 #ifndef SelectorQuery_h 27 #ifndef SelectorQuery_h
28 #define SelectorQuery_h 28 #define SelectorQuery_h
29 29
30 #include "core/css/CSSSelectorList.h" 30 #include "core/css/CSSSelectorList.h"
31 #include "platform/heap/Handle.h" 31 #include "platform/heap/Handle.h"
32 #include "wtf/HashMap.h" 32 #include "wtf/HashMap.h"
33 #include "wtf/Vector.h" 33 #include "wtf/Vector.h"
34 #include "wtf/text/AtomicStringHash.h" 34 #include "wtf/text/AtomicStringHash.h"
35 #include <memory>
35 36
36 namespace blink { 37 namespace blink {
37 38
38 class CSSSelector; 39 class CSSSelector;
39 class ContainerNode; 40 class ContainerNode;
40 class Document; 41 class Document;
41 class Element; 42 class Element;
42 class ExceptionState; 43 class ExceptionState;
43 template <typename NodeType> class StaticNodeTypeList; 44 template <typename NodeType> class StaticNodeTypeList;
44 typedef StaticNodeTypeList<Element> StaticElementList; 45 typedef StaticNodeTypeList<Element> StaticElementList;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 83
83 Vector<const CSSSelector*> m_selectors; 84 Vector<const CSSSelector*> m_selectors;
84 bool m_usesDeepCombinatorOrShadowPseudo : 1; 85 bool m_usesDeepCombinatorOrShadowPseudo : 1;
85 bool m_needsUpdatedDistribution : 1; 86 bool m_needsUpdatedDistribution : 1;
86 }; 87 };
87 88
88 class CORE_EXPORT SelectorQuery { 89 class CORE_EXPORT SelectorQuery {
89 WTF_MAKE_NONCOPYABLE(SelectorQuery); 90 WTF_MAKE_NONCOPYABLE(SelectorQuery);
90 USING_FAST_MALLOC(SelectorQuery); 91 USING_FAST_MALLOC(SelectorQuery);
91 public: 92 public:
92 static PassOwnPtr<SelectorQuery> adopt(CSSSelectorList); 93 static std::unique_ptr<SelectorQuery> adopt(CSSSelectorList);
93 94
94 bool matches(Element&) const; 95 bool matches(Element&) const;
95 Element* closest(Element&) const; 96 Element* closest(Element&) const;
96 StaticElementList* queryAll(ContainerNode& rootNode) const; 97 StaticElementList* queryAll(ContainerNode& rootNode) const;
97 Element* queryFirst(ContainerNode& rootNode) const; 98 Element* queryFirst(ContainerNode& rootNode) const;
98 private: 99 private:
99 explicit SelectorQuery(CSSSelectorList); 100 explicit SelectorQuery(CSSSelectorList);
100 101
101 SelectorDataList m_selectors; 102 SelectorDataList m_selectors;
102 CSSSelectorList m_selectorList; 103 CSSSelectorList m_selectorList;
103 }; 104 };
104 105
105 class SelectorQueryCache { 106 class SelectorQueryCache {
106 USING_FAST_MALLOC(SelectorQueryCache); 107 USING_FAST_MALLOC(SelectorQueryCache);
107 public: 108 public:
108 SelectorQuery* add(const AtomicString&, const Document&, ExceptionState&); 109 SelectorQuery* add(const AtomicString&, const Document&, ExceptionState&);
109 void invalidate(); 110 void invalidate();
110 111
111 private: 112 private:
112 HashMap<AtomicString, OwnPtr<SelectorQuery>> m_entries; 113 HashMap<AtomicString, std::unique_ptr<SelectorQuery>> m_entries;
113 }; 114 };
114 115
115 } // namespace blink 116 } // namespace blink
116 117
117 #endif 118 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/ProcessingInstruction.cpp ('k') | third_party/WebKit/Source/core/dom/SelectorQuery.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698