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

Unified Diff: third_party/WebKit/Source/core/dom/NodeIterator.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/NodeIterator.cpp
diff --git a/third_party/WebKit/Source/core/dom/NodeIterator.cpp b/third_party/WebKit/Source/core/dom/NodeIterator.cpp
index c3a7d06af683f096d2b6b5f6cb28c1e5ed8387eb..b8a1bf086335cad196d3b6fc4337db689484e32e 100644
--- a/third_party/WebKit/Source/core/dom/NodeIterator.cpp
+++ b/third_party/WebKit/Source/core/dom/NodeIterator.cpp
@@ -36,7 +36,7 @@ NodeIterator::NodePointer::NodePointer()
{
}
-NodeIterator::NodePointer::NodePointer(PassRefPtrWillBeRawPtr<Node> n, bool b)
+NodeIterator::NodePointer::NodePointer(RawPtr<Node> n, bool b)
: node(n)
, isPointerBeforeNode(b)
{
@@ -71,7 +71,7 @@ bool NodeIterator::NodePointer::moveToPrevious(Node* root)
return node;
}
-NodeIterator::NodeIterator(PassRefPtrWillBeRawPtr<Node> rootNode, unsigned whatToShow, PassRefPtrWillBeRawPtr<NodeFilter> filter)
+NodeIterator::NodeIterator(RawPtr<Node> rootNode, unsigned whatToShow, RawPtr<NodeFilter> filter)
: NodeIteratorBase(rootNode, whatToShow, filter)
, m_referenceNode(root(), true)
{
@@ -88,16 +88,16 @@ NodeIterator::~NodeIterator()
}
#endif
-PassRefPtrWillBeRawPtr<Node> NodeIterator::nextNode(ExceptionState& exceptionState)
+RawPtr<Node> NodeIterator::nextNode(ExceptionState& exceptionState)
{
- RefPtrWillBeRawPtr<Node> result = nullptr;
+ RawPtr<Node> result = nullptr;
m_candidateNode = m_referenceNode;
while (m_candidateNode.moveToNext(root())) {
// NodeIterators treat the DOM tree as a flat list of nodes.
// In other words, FILTER_REJECT does not pass over descendants
// of the rejected node. Hence, FILTER_REJECT is the same as FILTER_SKIP.
- RefPtrWillBeRawPtr<Node> provisionalResult = m_candidateNode.node;
+ RawPtr<Node> provisionalResult = m_candidateNode.node;
bool nodeWasAccepted = acceptNode(provisionalResult.get(), exceptionState) == NodeFilter::FILTER_ACCEPT;
if (exceptionState.hadException())
break;
@@ -112,16 +112,16 @@ PassRefPtrWillBeRawPtr<Node> NodeIterator::nextNode(ExceptionState& exceptionSta
return result.release();
}
-PassRefPtrWillBeRawPtr<Node> NodeIterator::previousNode(ExceptionState& exceptionState)
+RawPtr<Node> NodeIterator::previousNode(ExceptionState& exceptionState)
{
- RefPtrWillBeRawPtr<Node> result = nullptr;
+ RawPtr<Node> result = nullptr;
m_candidateNode = m_referenceNode;
while (m_candidateNode.moveToPrevious(root())) {
// NodeIterators treat the DOM tree as a flat list of nodes.
// In other words, FILTER_REJECT does not pass over descendants
// of the rejected node. Hence, FILTER_REJECT is the same as FILTER_SKIP.
- RefPtrWillBeRawPtr<Node> provisionalResult = m_candidateNode.node;
+ RawPtr<Node> provisionalResult = m_candidateNode.node;
bool nodeWasAccepted = acceptNode(provisionalResult.get(), exceptionState) == NodeFilter::FILTER_ACCEPT;
if (exceptionState.hadException())
break;
« no previous file with comments | « third_party/WebKit/Source/core/dom/NodeIterator.h ('k') | third_party/WebKit/Source/core/dom/NodeIterator.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698