chrome/browser/prefs/pref_model_associator.cc - Issue 10035042: Rewrite base::JSONReader to be 35-40% faster, depending on the input string.

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: chrome/browser/prefs/pref_model_associator.cc

Issue 10035042: Rewrite base::JSONReader to be 35-40% faster, depending on the input string. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Really fix Windows, address comments Created 8 years, 7 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

« no previous file with comments | « chrome/browser/extensions/settings/settings_leveldb_storage.cc ('k') | chrome/browser/ui/webui/tab_modal_confirm_dialog_webui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/pref_model_associator.cc

diff --git a/chrome/browser/prefs/pref_model_associator.cc b/chrome/browser/prefs/pref_model_associator.cc

index 16dc0c324f4f4ec06909451e482cb109a6cf6f97..bbdad77e5f027bd24682e345860dc285e0d8bb6e 100644

--- a/chrome/browser/prefs/pref_model_associator.cc

+++ b/chrome/browser/prefs/pref_model_associator.cc

@@ -49,8 +49,7 @@ void PrefModelAssociator::InitPrefAndAssociate(

sync_pref.GetSpecifics().preference();

DCHECK_EQ(pref->name(), preference.name());

- scoped_ptr<Value> value(

- reader.JsonToValue(preference.value(), false, false));

+ scoped_ptr<Value> value(reader.ReadToValue(preference.value()));

if (!value.get()) {

LOG(ERROR) << "Failed to deserialize preference value: "

<< reader.GetErrorMessage();

@@ -355,7 +354,7 @@ Value* PrefModelAssociator::ReadPreferenceSpecifics(

const sync_pb::PreferenceSpecifics& preference,

std::string* name) {

base::JSONReader reader;

- scoped_ptr<Value> value(reader.JsonToValue(preference.value(), false, false));

+ scoped_ptr<Value> value(reader.ReadToValue(preference.value()));

if (!value.get()) {

std::string err = "Failed to deserialize preference value: " +

reader.GetErrorMessage();