gpu/config/gpu_control_list.cc - Issue 1180693002: Update from https://crrev.com/333737

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gpu/config/gpu_control_list.cc

Issue 1180693002: Update from https://crrev.com/333737 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: rebased Created 5 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:

Index: gpu/config/gpu_control_list.cc

diff --git a/gpu/config/gpu_control_list.cc b/gpu/config/gpu_control_list.cc

index 3dd1d923ae9a0b53bc0bff2e27e61bc50a2aac09..6ea07f27895a7910cb9f0a0ee6202b0e12292888 100644

--- a/gpu/config/gpu_control_list.cc

+++ b/gpu/config/gpu_control_list.cc

@@ -1323,8 +1323,7 @@ GpuControlList::~GpuControlList() {

bool GpuControlList::LoadList(

const std::string& json_context,

GpuControlList::OsFilter os_filter) {

- scoped_ptr<base::Value> root;

- root.reset(base::JSONReader::Read(json_context));

+ scoped_ptr<base::Value> root(base::JSONReader::Read(json_context));

if (root.get() == NULL || !root->IsType(base::Value::TYPE_DICTIONARY))

return false;