mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Remove base::Value::CreateNullValue

Browse source 
https://codereview.chromium.org/2792573002
This commit is contained in:
Aleksei Kuzmin 2017-06-17 00:00:41 +03:00
parent c7f2e2731c
commit 3d700ee49f
3 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
atom/common/native_mate_converters/v8_value_converter.cc
View file

@ -10,6 +10,7 @@
#include <utility>
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "native_mate/dictionary.h"
@ -308,10 +309,10 @@ base::Value* V8ValueConverter::FromV8ValueImpl(
return nullptr;
if (val->IsExternal())
return base::Value::CreateNullValue().release();
return base::MakeUnique<base::Value>().release();
if (val->IsNull())
return base::Value::CreateNullValue().release();
return base::MakeUnique<base::Value>().release();
if (val->IsBoolean())
return new base::Value(val->ToBoolean()->Value());
@ -381,7 +382,7 @@ base::Value* V8ValueConverter::FromV8Array(
v8::Isolate* isolate) const {
ScopedUniquenessGuard uniqueness_guard(state, val);
if (!uniqueness_guard.is_valid())
return base::Value::CreateNullValue().release();
return base::MakeUnique<base::Value>().release();
std::unique_ptr<v8::Context::Scope> scope;
// If val was created in a different context than our current one, change to
@ -410,7 +411,7 @@ base::Value* V8ValueConverter::FromV8Array(
else
// JSON.stringify puts null in places where values don't serialize, for
// example undefined and functions. Emulate that behavior.
result->Append(base::Value::CreateNullValue());
result->Append(base::MakeUnique<base::Value>());
}
return result;
}
@ -429,7 +430,7 @@ base::Value* V8ValueConverter::FromV8Object(
v8::Isolate* isolate) const {
ScopedUniquenessGuard uniqueness_guard(state, val);
if (!uniqueness_guard.is_valid())
return base::Value::CreateNullValue().release();
return base::MakeUnique<base::Value>().release();
std::unique_ptr<v8::Context::Scope> scope;
// If val was created in a different context than our current one, change to