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

Unified Diff: third_party/WebKit/Source/core/dom/SelectorQuery.cpp

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
Index: third_party/WebKit/Source/core/dom/SelectorQuery.cpp
diff --git a/third_party/WebKit/Source/core/dom/SelectorQuery.cpp b/third_party/WebKit/Source/core/dom/SelectorQuery.cpp
index 449bf2b3b802b1b2c2ee0614b12dd84a72ed50ec..ee5af5bc467dbd48a9bac777fc0cf472ce6012ea 100644
--- a/third_party/WebKit/Source/core/dom/SelectorQuery.cpp
+++ b/third_party/WebKit/Source/core/dom/SelectorQuery.cpp
@@ -50,7 +50,7 @@ struct SingleElementSelectorQueryTrait {
};
struct AllElementsSelectorQueryTrait {
- typedef WillBeHeapVector<RefPtrWillBeMember<Element>> OutputType;
+ typedef HeapVector<Member<Element>> OutputType;
static const bool shouldOnlyMatchFirstElement = false;
ALWAYS_INLINE static void appendElement(OutputType& output, Element& element)
{
@@ -93,8 +93,8 @@ private:
}
const AtomicString& m_className;
- RawPtrWillBeMember<ContainerNode> m_rootNode;
- RawPtrWillBeMember<Element> m_currentElement;
+ Member<ContainerNode> m_rootNode;
+ Member<Element> m_currentElement;
};
void SelectorDataList::initialize(const CSSSelectorList& selectorList)
@@ -161,14 +161,14 @@ Element* SelectorDataList::closest(Element& targetElement) const
return nullptr;
}
-PassRefPtrWillBeRawPtr<StaticElementList> SelectorDataList::queryAll(ContainerNode& rootNode) const
+RawPtr<StaticElementList> SelectorDataList::queryAll(ContainerNode& rootNode) const
{
- WillBeHeapVector<RefPtrWillBeMember<Element>> result;
+ HeapVector<Member<Element>> result;
execute<AllElementsSelectorQueryTrait>(rootNode, result);
return StaticElementList::adopt(result);
}
-PassRefPtrWillBeRawPtr<Element> SelectorDataList::queryFirst(ContainerNode& rootNode) const
+RawPtr<Element> SelectorDataList::queryFirst(ContainerNode& rootNode) const
{
Element* matchedElement = nullptr;
execute<SingleElementSelectorQueryTrait>(rootNode, matchedElement);
@@ -481,7 +481,7 @@ void SelectorDataList::execute(ContainerNode& rootNode, typename SelectorQueryTr
if (const CSSSelector* idSelector = selectorForIdLookup(firstSelector)) {
const AtomicString& idToMatch = idSelector->value();
if (rootNode.treeScope().containsMultipleElementsWithId(idToMatch)) {
- const WillBeHeapVector<RawPtrWillBeMember<Element>>& elements = rootNode.treeScope().getAllElementsById(idToMatch);
+ const HeapVector<Member<Element>>& elements = rootNode.treeScope().getAllElementsById(idToMatch);
size_t count = elements.size();
for (size_t i = 0; i < count; ++i) {
Element& element = *elements[i];
@@ -541,12 +541,12 @@ Element* SelectorQuery::closest(Element& element) const
return m_selectors.closest(element);
}
-PassRefPtrWillBeRawPtr<StaticElementList> SelectorQuery::queryAll(ContainerNode& rootNode) const
+RawPtr<StaticElementList> SelectorQuery::queryAll(ContainerNode& rootNode) const
{
return m_selectors.queryAll(rootNode);
}
-PassRefPtrWillBeRawPtr<Element> SelectorQuery::queryFirst(ContainerNode& rootNode) const
+RawPtr<Element> SelectorQuery::queryFirst(ContainerNode& rootNode) const
{
return m_selectors.queryFirst(rootNode);
}
« no previous file with comments | « third_party/WebKit/Source/core/dom/SelectorQuery.h ('k') | third_party/WebKit/Source/core/dom/SelectorQueryTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698