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

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

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/css/parser/CSSParserImpl.cpp
diff --git a/third_party/WebKit/Source/core/css/parser/CSSParserImpl.cpp b/third_party/WebKit/Source/core/css/parser/CSSParserImpl.cpp
index afe156ff6fe91d11d73fa6bf05a3841d2ef3f674..f9c9e8d6c76964bcbd652d51dcd9a57fc5f9ba83 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSParserImpl.cpp
+++ b/third_party/WebKit/Source/core/css/parser/CSSParserImpl.cpp
@@ -28,9 +28,7 @@
#include "core/frame/Deprecation.h"
#include "core/frame/UseCounter.h"
#include "platform/TraceEvent.h"
-#include "wtf/PtrUtil.h"
#include <bitset>
-#include <memory>
namespace blink {
@@ -206,7 +204,7 @@ CSSSelectorList CSSParserImpl::parsePageSelector(CSSParserTokenRange range, Styl
if (!range.atEnd())
return CSSSelectorList(); // Parse error; extra tokens in @page selector
- std::unique_ptr<CSSParserSelector> selector;
+ OwnPtr<CSSParserSelector> selector;
if (!typeSelector.isNull() && pseudo.isNull()) {
selector = CSSParserSelector::create(QualifiedName(nullAtom, typeSelector, styleSheet->defaultNamespace()));
} else {
@@ -223,7 +221,7 @@ CSSSelectorList CSSParserImpl::parsePageSelector(CSSParserTokenRange range, Styl
}
selector->setForPage();
- Vector<std::unique_ptr<CSSParserSelector>> selectorVector;
+ Vector<OwnPtr<CSSParserSelector>> selectorVector;
selectorVector.append(std::move(selector));
CSSSelectorList selectorList = CSSSelectorList::adoptSelectorVector(selectorVector);
return selectorList;
@@ -251,7 +249,7 @@ ImmutableStylePropertySet* CSSParserImpl::parseCustomPropertySet(CSSParserTokenR
return createStylePropertySet(parser.m_parsedProperties, HTMLStandardMode);
}
-std::unique_ptr<Vector<double>> CSSParserImpl::parseKeyframeKeyList(const String& keyList)
+PassOwnPtr<Vector<double>> CSSParserImpl::parseKeyframeKeyList(const String& keyList)
{
return consumeKeyframeKeyList(CSSTokenizer::Scope(keyList).tokenRange());
}
@@ -648,7 +646,7 @@ void CSSParserImpl::consumeApplyRule(CSSParserTokenRange prelude)
StyleRuleKeyframe* CSSParserImpl::consumeKeyframeStyleRule(CSSParserTokenRange prelude, CSSParserTokenRange block)
{
- std::unique_ptr<Vector<double>> keyList = consumeKeyframeKeyList(prelude);
+ OwnPtr<Vector<double>> keyList = consumeKeyframeKeyList(prelude);
if (!keyList)
return nullptr;
@@ -805,9 +803,9 @@ void CSSParserImpl::consumeDeclarationValue(CSSParserTokenRange range, CSSProper
CSSPropertyParser::parseValue(unresolvedProperty, important, range, m_context, m_parsedProperties, ruleType);
}
-std::unique_ptr<Vector<double>> CSSParserImpl::consumeKeyframeKeyList(CSSParserTokenRange range)
+PassOwnPtr<Vector<double>> CSSParserImpl::consumeKeyframeKeyList(CSSParserTokenRange range)
{
- std::unique_ptr<Vector<double>> result = wrapUnique(new Vector<double>);
+ OwnPtr<Vector<double>> result = adoptPtr(new Vector<double>);
while (true) {
range.consumeWhitespace();
const CSSParserToken& token = range.consumeIncludingWhitespace();

Powered by Google App Engine
This is Rietveld 408576698