Index: third_party/WebKit/Source/core/css/parser/CSSParserSelector.cpp |
diff --git a/third_party/WebKit/Source/core/css/parser/CSSParserSelector.cpp b/third_party/WebKit/Source/core/css/parser/CSSParserSelector.cpp |
index f3263eacd39e50d987d6385845b1193a712d8a3d..93b8731ebcf4faf4690b916ee9babb75d4da048c 100644 |
--- a/third_party/WebKit/Source/core/css/parser/CSSParserSelector.cpp |
+++ b/third_party/WebKit/Source/core/css/parser/CSSParserSelector.cpp |
@@ -21,16 +21,18 @@ |
#include "core/css/parser/CSSParserSelector.h" |
#include "core/css/CSSSelectorList.h" |
+#include "wtf/PtrUtil.h" |
+#include <memory> |
namespace blink { |
CSSParserSelector::CSSParserSelector() |
- : m_selector(adoptPtr(new CSSSelector())) |
+ : m_selector(wrapUnique(new CSSSelector())) |
{ |
} |
CSSParserSelector::CSSParserSelector(const QualifiedName& tagQName, bool isImplicit) |
- : m_selector(adoptPtr(new CSSSelector(tagQName, isImplicit))) |
+ : m_selector(wrapUnique(new CSSSelector(tagQName, isImplicit))) |
{ |
} |
@@ -38,10 +40,10 @@ CSSParserSelector::~CSSParserSelector() |
{ |
if (!m_tagHistory) |
return; |
- Vector<OwnPtr<CSSParserSelector>, 16> toDelete; |
- OwnPtr<CSSParserSelector> selector = std::move(m_tagHistory); |
+ Vector<std::unique_ptr<CSSParserSelector>, 16> toDelete; |
+ std::unique_ptr<CSSParserSelector> selector = std::move(m_tagHistory); |
while (true) { |
- OwnPtr<CSSParserSelector> next = std::move(selector->m_tagHistory); |
+ std::unique_ptr<CSSParserSelector> next = std::move(selector->m_tagHistory); |
toDelete.append(std::move(selector)); |
if (!next) |
break; |
@@ -49,13 +51,13 @@ CSSParserSelector::~CSSParserSelector() |
} |
} |
-void CSSParserSelector::adoptSelectorVector(Vector<OwnPtr<CSSParserSelector>>& selectorVector) |
+void CSSParserSelector::adoptSelectorVector(Vector<std::unique_ptr<CSSParserSelector>>& selectorVector) |
{ |
CSSSelectorList* selectorList = new CSSSelectorList(CSSSelectorList::adoptSelectorVector(selectorVector)); |
- m_selector->setSelectorList(adoptPtr(selectorList)); |
+ m_selector->setSelectorList(wrapUnique(selectorList)); |
} |
-void CSSParserSelector::setSelectorList(PassOwnPtr<CSSSelectorList> selectorList) |
+void CSSParserSelector::setSelectorList(std::unique_ptr<CSSSelectorList> selectorList) |
{ |
m_selector->setSelectorList(std::move(selectorList)); |
} |
@@ -80,7 +82,7 @@ bool CSSParserSelector::isSimple() const |
return false; |
} |
-void CSSParserSelector::appendTagHistory(CSSSelector::RelationType relation, PassOwnPtr<CSSParserSelector> selector) |
+void CSSParserSelector::appendTagHistory(CSSSelector::RelationType relation, std::unique_ptr<CSSParserSelector> selector) |
{ |
CSSParserSelector* end = this; |
while (end->tagHistory()) |
@@ -89,7 +91,7 @@ void CSSParserSelector::appendTagHistory(CSSSelector::RelationType relation, Pas |
end->setTagHistory(std::move(selector)); |
} |
-PassOwnPtr<CSSParserSelector> CSSParserSelector::releaseTagHistory() |
+std::unique_ptr<CSSParserSelector> CSSParserSelector::releaseTagHistory() |
{ |
setRelation(CSSSelector::SubSelector); |
return std::move(m_tagHistory); |
@@ -97,11 +99,11 @@ PassOwnPtr<CSSParserSelector> CSSParserSelector::releaseTagHistory() |
void CSSParserSelector::prependTagSelector(const QualifiedName& tagQName, bool isImplicit) |
{ |
- OwnPtr<CSSParserSelector> second = CSSParserSelector::create(); |
+ std::unique_ptr<CSSParserSelector> second = CSSParserSelector::create(); |
second->m_selector = std::move(m_selector); |
second->m_tagHistory = std::move(m_tagHistory); |
m_tagHistory = std::move(second); |
- m_selector = adoptPtr(new CSSSelector(tagQName, isImplicit)); |
+ m_selector = wrapUnique(new CSSSelector(tagQName, isImplicit)); |
} |
bool CSSParserSelector::isHostPseudoSelector() const |