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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gpu/tools/compositor_model_bench/render_tree.cc

Issue 9960077: Modify the base::JSONReader interface to take a set of options rather than a boolean flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 8 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
« base/json/json_reader.h ('K') | « content/browser/speech/google_one_shot_remote_engine.cc ('k') | jingle/glue/utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/tools/compositor_model_bench/render_tree.cc
diff --git a/gpu/tools/compositor_model_bench/render_tree.cc b/gpu/tools/compositor_model_bench/render_tree.cc
index 9e14ca28c2aff1085a628b75b4e8c5e9e5186c28..c8e928a5add69a910a54f7118129b4792572d68f 100644
--- a/gpu/tools/compositor_model_bench/render_tree.cc
+++ b/gpu/tools/compositor_model_bench/render_tree.cc
@@ -461,7 +461,7 @@ RenderNode* BuildRenderTreeFromFile(const FilePath& path) {
int error_code = 0;
string error_message;
root.reset(JSONReader::ReadAndReturnError(contents,
- true,
+ base::JSON_ALLOW_TRAILING_COMMAS,
&error_code,
&error_message));
if (!root.get()) {
« base/json/json_reader.h ('K') | « content/browser/speech/google_one_shot_remote_engine.cc ('k') | jingle/glue/utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698