third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp - Issue 1983753002: Remove OwnPtr::release() calls in core/ (part 2).

Unified Diff: third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp

Issue 1983753002: Remove OwnPtr::release() calls in core/ (part 2). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 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 | « third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp ('k') | third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp

diff --git a/third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp

index e478a67591a2715451eab09393f89f766abb03a1..5b1effe33c5c5223cc379b57c484b80885f365fb 100644

--- a/third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp

+++ b/third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp

@@ -97,13 +97,13 @@ CSSSelectorList CSSSelectorParser::consumeComplexSelectorList(CSSParserTokenRang

OwnPtr<CSSParserSelector> selector = consumeComplexSelector(range);

if (!selector)

return CSSSelectorList();

- selectorList.append(selector.release());

+ selectorList.append(std::move(selector));

while (!range.atEnd() && range.peek().type() == CommaToken) {

range.consumeIncludingWhitespace();

selector = consumeComplexSelector(range);

if (!selector)

return CSSSelectorList();

- selectorList.append(selector.release());

+ selectorList.append(std::move(selector));

}

if (m_failedParsing)

@@ -119,14 +119,14 @@ CSSSelectorList CSSSelectorParser::consumeCompoundSelectorList(CSSParserTokenRan

range.consumeWhitespace();

if (!selector)

return CSSSelectorList();

- selectorList.append(selector.release());

+ selectorList.append(std::move(selector));

while (!range.atEnd() && range.peek().type() == CommaToken) {

range.consumeIncludingWhitespace();

selector = consumeCompoundSelector(range);

range.consumeWhitespace();

if (!selector)

return CSSSelectorList();

- selectorList.append(selector.release());

+ selectorList.append(std::move(selector));

}

if (m_failedParsing)

@@ -175,7 +175,7 @@ PassOwnPtr<CSSParserSelector> CSSSelectorParser::consumeComplexSelector(CSSParse

while (CSSSelector::RelationType combinator = consumeCombinator(range)) {

OwnPtr<CSSParserSelector> nextSelector = consumeCompoundSelector(range);

if (!nextSelector)

- return combinator == CSSSelector::Descendant ? selector.release() : nullptr;

+ return combinator == CSSSelector::Descendant ? std::move(selector) : nullptr;

if (previousCompoundFlags & HasPseudoElementForRightmostCompound)

return nullptr;

CSSParserSelector* end = nextSelector.get();

@@ -188,12 +188,12 @@ PassOwnPtr<CSSParserSelector> CSSSelectorParser::consumeComplexSelector(CSSParse

if (previousCompoundFlags & HasContentPseudoElement)

end->setRelationIsAffectedByPseudoContent();

previousCompoundFlags = compoundFlags;

- end->setTagHistory(selector.release());

+ end->setTagHistory(std::move(selector));

- selector = nextSelector.release();

+ selector = std::move(nextSelector);

}

- return selector.release();

+ return selector;

}

namespace {

@@ -304,9 +304,9 @@ PassOwnPtr<CSSParserSelector> CSSSelectorParser::consumeCompoundSelector(CSSPars

compoundPseudoElement = simpleSelector->pseudoType();

if (compoundSelector)

- compoundSelector = addSimpleSelectorToCompound(compoundSelector.release(), simpleSelector.release());

+ compoundSelector = addSimpleSelectorToCompound(std::move(compoundSelector), std::move(simpleSelector));

else

- compoundSelector = simpleSelector.release();

+ compoundSelector = std::move(simpleSelector);

}

if (!compoundSelector) {

@@ -320,7 +320,7 @@ PassOwnPtr<CSSParserSelector> CSSSelectorParser::consumeCompoundSelector(CSSPars

return CSSParserSelector::create(QualifiedName(namespacePrefix, elementName, namespaceURI));

}

prependTypeSelectorIfNeeded(namespacePrefix, elementName, compoundSelector.get());

- return splitCompoundAtImplicitShadowCrossingCombinator(compoundSelector.release());

+ return splitCompoundAtImplicitShadowCrossingCombinator(std::move(compoundSelector));

}

PassOwnPtr<CSSParserSelector> CSSSelectorParser::consumeSimpleSelector(CSSParserTokenRange& range)

@@ -339,7 +339,7 @@ PassOwnPtr<CSSParserSelector> CSSSelectorParser::consumeSimpleSelector(CSSParser

return nullptr;

if (!selector)

m_failedParsing = true;

- return selector.release();

+ return selector;

}

bool CSSSelectorParser::consumeName(CSSParserTokenRange& range, AtomicString& name, AtomicString& namespacePrefix)

@@ -389,7 +389,7 @@ PassOwnPtr<CSSParserSelector> CSSSelectorParser::consumeId(CSSParserTokenRange&

selector->setMatch(CSSSelector::Id);

const AtomicString& value = range.consume().value();

selector->setValue(value, isQuirksModeBehavior(m_context.matchMode()));

- return selector.release();

+ return selector;

}

PassOwnPtr<CSSParserSelector> CSSSelectorParser::consumeClass(CSSParserTokenRange& range)

@@ -403,7 +403,7 @@ PassOwnPtr<CSSParserSelector> CSSSelectorParser::consumeClass(CSSParserTokenRang

selector->setMatch(CSSSelector::Class);

const AtomicString& value = range.consume().value();

selector->setValue(value, isQuirksModeBehavior(m_context.matchMode()));

- return selector.release();

+ return selector;

}

PassOwnPtr<CSSParserSelector> CSSSelectorParser::consumeAttribute(CSSParserTokenRange& range)

@@ -434,7 +434,7 @@ PassOwnPtr<CSSParserSelector> CSSSelectorParser::consumeAttribute(CSSParserToken

if (block.atEnd()) {

selector->setAttribute(qualifiedName, CSSSelector::CaseSensitive);

selector->setMatch(CSSSelector::AttributeSet);

- return selector.release();

+ return selector;

}

selector->setMatch(consumeAttributeMatch(block));

@@ -447,7 +447,7 @@ PassOwnPtr<CSSParserSelector> CSSSelectorParser::consumeAttribute(CSSParserToken

if (!block.atEnd())

return nullptr;

- return selector.release();

+ return selector;

}

PassOwnPtr<CSSParserSelector> CSSSelectorParser::consumePseudo(CSSParserTokenRange& range)

@@ -479,7 +479,7 @@ PassOwnPtr<CSSParserSelector> CSSSelectorParser::consumePseudo(CSSParserTokenRan

range.consume();

if (selector->pseudoType() == CSSSelector::PseudoUnknown)

return nullptr;

- return selector.release();

+ return selector;

}

CSSParserTokenRange block = range.consumeBlock();

@@ -499,8 +499,8 @@ PassOwnPtr<CSSParserSelector> CSSSelectorParser::consumePseudo(CSSParserTokenRan

*selectorList = consumeCompoundSelectorList(block);

if (!selectorList->isValid() || !block.atEnd())

return nullptr;

- selector->setSelectorList(selectorList.release());

- return selector.release();

+ selector->setSelectorList(std::move(selectorList));

+ return selector;

}

case CSSSelector::PseudoNot:

{

@@ -509,9 +509,9 @@ PassOwnPtr<CSSParserSelector> CSSSelectorParser::consumePseudo(CSSParserTokenRan

if (!innerSelector || !innerSelector->isSimple() || !block.atEnd())

return nullptr;

Vector<OwnPtr<CSSParserSelector>> selectorVector;

- selectorVector.append(innerSelector.release());

+ selectorVector.append(std::move(innerSelector));

selector->adoptSelectorVector(selectorVector);

- return selector.release();

+ return selector;

}

case CSSSelector::PseudoSlotted:

{

@@ -522,9 +522,9 @@ PassOwnPtr<CSSParserSelector> CSSSelectorParser::consumePseudo(CSSParserTokenRan

if (!innerSelector || !block.atEnd() || !RuntimeEnabledFeatures::shadowDOMV1Enabled())

return nullptr;

Vector<OwnPtr<CSSParserSelector>> selectorVector;

- selectorVector.append(innerSelector.release());

+ selectorVector.append(std::move(innerSelector));

selector->adoptSelectorVector(selectorVector);

- return selector.release();

+ return selector;

}

case CSSSelector::PseudoLang:

{

@@ -533,7 +533,7 @@ PassOwnPtr<CSSParserSelector> CSSSelectorParser::consumePseudo(CSSParserTokenRan

if (ident.type() != IdentToken || !block.atEnd())

return nullptr;

selector->setArgument(ident.value());

- return selector.release();

+ return selector;

}

case CSSSelector::PseudoNthChild:

case CSSSelector::PseudoNthLastChild:

@@ -547,7 +547,7 @@ PassOwnPtr<CSSParserSelector> CSSSelectorParser::consumePseudo(CSSParserTokenRan

if (!block.atEnd())

return nullptr;

selector->setNth(ab.first, ab.second);

- return selector.release();

+ return selector;

}

default:

break;

@@ -787,7 +787,7 @@ PassOwnPtr<CSSParserSelector> CSSSelectorParser::splitCompoundAtImplicitShadowCr

OwnPtr<CSSParserSelector> secondCompound = splitAfter->releaseTagHistory();

secondCompound->appendTagHistory(secondCompound->pseudoType() == CSSSelector::PseudoSlotted ? CSSSelector::ShadowSlot : CSSSelector::ShadowPseudo, std::move(compoundSelector));

- return secondCompound.release();

+ return secondCompound;

}

} // namespace blink