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

Unified Diff: third_party/WebKit/Source/core/css/CSSSelectorList.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. 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/CSSSelectorList.cpp
diff --git a/third_party/WebKit/Source/core/css/CSSSelectorList.cpp b/third_party/WebKit/Source/core/css/CSSSelectorList.cpp
index 541104dab0c342f5b8dd0bfb1bb2d838842860f0..01544222a9f4c6edcf81c512cd93dd8de1cdfbb2 100644
--- a/third_party/WebKit/Source/core/css/CSSSelectorList.cpp
+++ b/third_party/WebKit/Source/core/css/CSSSelectorList.cpp
@@ -29,6 +29,7 @@
#include "core/css/parser/CSSParserSelector.h"
#include "wtf/allocator/Partitions.h"
#include "wtf/text/StringBuilder.h"
+#include <memory>
namespace {
// CSSSelector is one of the top types that consume renderer memory,
@@ -52,7 +53,7 @@ CSSSelectorList CSSSelectorList::copy() const
return list;
}
-CSSSelectorList CSSSelectorList::adoptSelectorVector(Vector<OwnPtr<CSSParserSelector>>& selectorVector)
+CSSSelectorList CSSSelectorList::adoptSelectorVector(Vector<std::unique_ptr<CSSParserSelector>>& selectorVector)
{
size_t flattenedSize = 0;
for (size_t i = 0; i < selectorVector.size(); ++i) {
@@ -68,7 +69,7 @@ CSSSelectorList CSSSelectorList::adoptSelectorVector(Vector<OwnPtr<CSSParserSele
CSSParserSelector* current = selectorVector[i].get();
while (current) {
// Move item from the parser selector vector into m_selectorArray without invoking destructor (Ugh.)
- CSSSelector* currentSelector = current->releaseSelector().leakPtr();
+ CSSSelector* currentSelector = current->releaseSelector().release();
memcpy(&list.m_selectorArray[arrayIndex], currentSelector, sizeof(CSSSelector));
WTF::Partitions::fastFree(currentSelector);
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSSelectorList.h ('k') | third_party/WebKit/Source/core/css/CSSStyleSheetResourceTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698