ppapi/proxy/raw_var_data.cc - Issue 1864293002: Convert //ppapi to use std::unique_ptr

Unified Diff: ppapi/proxy/raw_var_data.cc

Issue 1864293002: Convert //ppapi to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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: ppapi/proxy/raw_var_data.cc

diff --git a/ppapi/proxy/raw_var_data.cc b/ppapi/proxy/raw_var_data.cc

index f4bcf96b6684d55e2d2e62b5bb10e4448244e4f6..0a1e70cb023097f0347dfaebec505e08067b6b88 100644

--- a/ppapi/proxy/raw_var_data.cc

+++ b/ppapi/proxy/raw_var_data.cc

@@ -7,6 +7,7 @@

#include <stack>

#include "base/containers/hash_tables.h"

+#include "base/memory/ptr_util.h"

#include "base/stl_util.h"

#include "ipc/ipc_message.h"

#include "ppapi/proxy/ppapi_param_traits.h"

@@ -44,18 +45,18 @@ struct StackEntry {

// |visited_map| keeps track of RawVarDatas that have already been created.

size_t GetOrCreateRawVarData(const PP_Var& var,

base::hash_map<int64_t, size_t>* visited_map,

- std::vector<scoped_ptr<RawVarData>>* data) {

+ std::vector<std::unique_ptr<RawVarData>>* data) {

if (VarTracker::IsVarTypeRefcounted(var.type)) {

base::hash_map<int64_t, size_t>::iterator it = visited_map->find(

var.value.as_id);

if (it != visited_map->end()) {

return it->second;

} else {

- data->push_back(make_scoped_ptr(RawVarData::Create(var.type)));

+ data->push_back(base::WrapUnique(RawVarData::Create(var.type)));

(*visited_map)[var.value.as_id] = data->size() - 1;

}

} else {

- data->push_back(make_scoped_ptr(RawVarData::Create(var.type)));

+ data->push_back(base::WrapUnique(RawVarData::Create(var.type)));

}

return data->size() - 1;

}

@@ -83,9 +84,9 @@ RawVarDataGraph::~RawVarDataGraph() {

// node at the top of the stack has already been visited, then we pop it off the

// stack and erase it from |parent_ids|.

// static

-scoped_ptr<RawVarDataGraph> RawVarDataGraph::Create(const PP_Var& var,

- PP_Instance instance) {

- scoped_ptr<RawVarDataGraph> graph(new RawVarDataGraph);

+std::unique_ptr<RawVarDataGraph> RawVarDataGraph::Create(const PP_Var& var,

+ PP_Instance instance) {

+ std::unique_ptr<RawVarDataGraph> graph(new RawVarDataGraph);

// Map of |var.value.as_id| to a RawVarData index in RawVarDataGraph.

base::hash_map<int64_t, size_t> visited_map;

base::hash_set<int64_t> parent_ids;

@@ -109,7 +110,7 @@ scoped_ptr<RawVarDataGraph> RawVarDataGraph::Create(const PP_Var& var,

parent_ids.insert(current_var.value.as_id);

if (!current_var_data->Init(current_var, instance)) {

NOTREACHED();

- return scoped_ptr<RawVarDataGraph>();

+ return std::unique_ptr<RawVarDataGraph>();

piman 2016/04/06 21:25:03 nit: nullptr, here and below?

dcheng 2016/04/06 21:29:05 Done.

}

// Add child nodes to the stack.

@@ -117,7 +118,7 @@ scoped_ptr<RawVarDataGraph> RawVarDataGraph::Create(const PP_Var& var,

ArrayVar* array_var = ArrayVar::FromPPVar(current_var);

if (!array_var) {

NOTREACHED();

- return scoped_ptr<RawVarDataGraph>();

+ return std::unique_ptr<RawVarDataGraph>();

}

for (ArrayVar::ElementVector::const_iterator iter =

array_var->elements().begin();

@@ -127,7 +128,7 @@ scoped_ptr<RawVarDataGraph> RawVarDataGraph::Create(const PP_Var& var,

// If a child of this node is already in parent_ids, we have a cycle so

// we just return null.

if (CanHaveChildren(child) && parent_ids.count(child.value.as_id) != 0)

- return scoped_ptr<RawVarDataGraph>();

+ return std::unique_ptr<RawVarDataGraph>();

size_t child_id = GetOrCreateRawVarData(child, &visited_map,

&graph->data_);

static_cast<ArrayRawVarData*>(current_var_data)->AddChild(child_id);

@@ -138,7 +139,7 @@ scoped_ptr<RawVarDataGraph> RawVarDataGraph::Create(const PP_Var& var,

DictionaryVar* dict_var = DictionaryVar::FromPPVar(current_var);

if (!dict_var) {

NOTREACHED();

- return scoped_ptr<RawVarDataGraph>();

+ return std::unique_ptr<RawVarDataGraph>();

}

for (DictionaryVar::KeyValueMap::const_iterator iter =

dict_var->key_value_map().begin();

@@ -146,7 +147,7 @@ scoped_ptr<RawVarDataGraph> RawVarDataGraph::Create(const PP_Var& var,

++iter) {

const PP_Var& child = iter->second.get();

if (CanHaveChildren(child) && parent_ids.count(child.value.as_id) != 0)

- return scoped_ptr<RawVarDataGraph>();

+ return std::unique_ptr<RawVarDataGraph>();

size_t child_id = GetOrCreateRawVarData(child, &visited_map,

&graph->data_);

static_cast<DictionaryRawVarData*>(

@@ -184,20 +185,21 @@ void RawVarDataGraph::Write(base::Pickle* m,

}

// static

-scoped_ptr<RawVarDataGraph> RawVarDataGraph::Read(const base::Pickle* m,

- base::PickleIterator* iter) {

- scoped_ptr<RawVarDataGraph> result(new RawVarDataGraph);

+std::unique_ptr<RawVarDataGraph> RawVarDataGraph::Read(

+ const base::Pickle* m,

+ base::PickleIterator* iter) {

+ std::unique_ptr<RawVarDataGraph> result(new RawVarDataGraph);

uint32_t size = 0;

if (!iter->ReadUInt32(&size))

- return scoped_ptr<RawVarDataGraph>();

+ return std::unique_ptr<RawVarDataGraph>();

piman 2016/04/06 21:25:03 (also here and below)

dcheng 2016/04/06 21:29:05 FWIW, I'm cautiously optimistic that clang-tidy wi

for (uint32_t i = 0; i < size; ++i) {

int32_t type;

if (!iter->ReadInt(&type))

- return scoped_ptr<RawVarDataGraph>();

+ return std::unique_ptr<RawVarDataGraph>();

PP_VarType var_type = static_cast<PP_VarType>(type);

- result->data_.push_back(make_scoped_ptr(RawVarData::Create(var_type)));

+ result->data_.push_back(base::WrapUnique(RawVarData::Create(var_type)));

if (!result->data_.back()->Read(var_type, m, iter))

- return scoped_ptr<RawVarDataGraph>();

+ return std::unique_ptr<RawVarDataGraph>();

}

return result;

}

« ppapi/proxy/ppp_messaging_proxy.cc ('K') | « ppapi/proxy/raw_var_data.h ('k') | ppapi/proxy/raw_var_data_unittest.cc » ('j') | ppapi/proxy/udp_socket_filter.h » ('J')