Revert r6051, re-adding json to DEPS file

Revert r6051, re-adding json to DEPS file
Committed: https://code.google.com/p/skia/source/detail?r=6202

[epoger, 2012-10-30 15:37:36]

Reverts https://code.google.com/p/skia/source/detail?r=6051

My understanding was that we removed the json dependency because of
https://code.google.com/p/skia/issues/detail?id=949 ('as of ~11am 10/23, all
buildbots are failing "update" step because of a sourceforge/jsoncpp problem')

I would like to start using json so gm can read/write checksum files in this
format as part of https://goto.google.com/ImprovingTheSkiaRebaseliningProcess

Is there no longer other code that uses the json library?

[epoger, 2012-10-30 15:40:10]

P.S. It looks like the sourceforge/jsoncpp problem described in
https://code.google.com/p/skia/issues/detail?id=949 has gone away.  Maybe
Hurricane Sandy fixed something?

$ svn ls http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/
branches/
tags/
trunk/

[EricB, 2012-10-30 15:40:44]

I believe that the code using JSON was experimental or was using a different
copy.  Adding djsollen@ who knows better than I.

[epoger, 2012-10-30 15:45:20]

On 2012/10/30 15:40:44, EricB wrote:
> I believe that the code using JSON was experimental or was using a different
> copy.  Adding djsollen@ who knows better than I.

Maybe this helps jog someone's memory?

$ grep -r -i json trunk/ android/ | grep -v \.svn | grep -v
^trunk/third_party/externals/jsoncpp

trunk/bench/bench_graph_svg.py:import json
trunk/bench/bench_graph_svg.py:        reduce(lambda
x,y:x+json.dumps(str(y))+',',options[option],"")[0:-1]
trunk/bench/bench_graph_svg.py:            var lines =
JSON.parse(selectElem.options[i].value);
trunk/bench/bench_graph_svg.py:            var linesSelected =
JSON.parse(selectElem.options[i].value);
Binary file
trunk/third_party/externals/angle/samples/gles2_book/MultiTexture/basemap.tga
matches
trunk/third_party/externals/gyp/tools/graphviz.py:"""Using the JSON dumped by
the dump-dependency-json generator,
trunk/third_party/externals/gyp/tools/graphviz.py:import json
trunk/third_party/externals/gyp/tools/graphviz.py:  file = open('dump.json')
trunk/third_party/externals/gyp/tools/graphviz.py:  edges = json.load(file)
trunk/third_party/externals/gyp/tools/graphviz.py:  edges =
LoadEdges('dump.json', sys.argv[1:])
trunk/third_party/externals/gyp/test/hard_dependency/gyptest-no-exported-hard-dependency.py:if
test.format == 'dump_dependency_json':
trunk/third_party/externals/gyp/test/hard_dependency/gyptest-no-exported-hard-dependency.py:
 test.skip_test('Skipping test; dependency JSON does not adjust ' \
trunk/third_party/externals/gyp/test/hard_dependency/gyptest-exported-hard-dependency.py:if
test.format == 'dump_dependency_json':
trunk/third_party/externals/gyp/test/hard_dependency/gyptest-exported-hard-dependency.py:
 test.skip_test('Skipping test; dependency JSON does not adjust ' \
trunk/third_party/externals/gyp/pylib/gyp/generator/dump_dependency_json.py:import
json
trunk/third_party/externals/gyp/pylib/gyp/generator/dump_dependency_json.py: 
filename = 'dump.json'
trunk/third_party/externals/gyp/pylib/gyp/generator/dump_dependency_json.py: 
json.dump(edges, f)
trunk/third_party/externals/gyp/pylib/gyp/generator/dump_dependency_json.py: 
print 'Wrote json to %s.' % filename
trunk/include/utils/SkJSON.h:#ifndef SkJSON_DEFINED
trunk/include/utils/SkJSON.h:#define SkJSON_DEFINED
trunk/include/utils/SkJSON.h:class SkJSON {
trunk/src/utils/SkJSON.cpp:#include "SkJSON.h"
trunk/src/utils/SkJSON.cpp://    #define TRACE_SKJSON_LEAKS
trunk/src/utils/SkJSON.cpp:#ifdef TRACE_SKJSON_LEAKS
trunk/src/utils/SkJSON.cpp:struct SkJSON::Object::Slot {
trunk/src/utils/SkJSON.cpp:SkJSON::Object::Slot::~Slot() {
trunk/src/utils/SkJSON.cpp:SkJSON::Object::Iter::Iter(const Object& obj) :
fSlot(obj.fHead) {}
trunk/src/utils/SkJSON.cpp:bool SkJSON::Object::Iter::done() const {
trunk/src/utils/SkJSON.cpp:void SkJSON::Object::Iter::next() {
trunk/src/utils/SkJSON.cpp:SkJSON::Type SkJSON::Object::Iter::type() const {
trunk/src/utils/SkJSON.cpp:const char* SkJSON::Object::Iter::name() const {
trunk/src/utils/SkJSON.cpp:SkJSON::Object* SkJSON::Object::Iter::objectValue()
const {
trunk/src/utils/SkJSON.cpp:SkJSON::Array* SkJSON::Object::Iter::arrayValue()
const {
trunk/src/utils/SkJSON.cpp:const char* SkJSON::Object::Iter::stringValue() const
{
trunk/src/utils/SkJSON.cpp:int32_t SkJSON::Object::Iter::intValue() const {
trunk/src/utils/SkJSON.cpp:float SkJSON::Object::Iter::floatValue() const {
trunk/src/utils/SkJSON.cpp:bool SkJSON::Object::Iter::boolValue() const {
trunk/src/utils/SkJSON.cpp:SkJSON::Object::Object() : fHead(NULL), fTail(NULL) {
trunk/src/utils/SkJSON.cpp:SkJSON::Object::Object(const Object& other) :
fHead(NULL), fTail(NULL) {
trunk/src/utils/SkJSON.cpp:SkJSON::Object::~Object() {
trunk/src/utils/SkJSON.cpp:int SkJSON::Object::count() const {
trunk/src/utils/SkJSON.cpp:SkJSON::Object::Slot* SkJSON::Object::addSlot(Slot*
slot) {
trunk/src/utils/SkJSON.cpp:void SkJSON::Object::addObject(const char name[],
SkJSON::Object* value) {
trunk/src/utils/SkJSON.cpp:void SkJSON::Object::addArray(const char name[],
SkJSON::Array* value) {
trunk/src/utils/SkJSON.cpp:void SkJSON::Object::addString(const char name[],
const char value[]) {
trunk/src/utils/SkJSON.cpp:void SkJSON::Object::addInt(const char name[],
int32_t value) {
trunk/src/utils/SkJSON.cpp:void SkJSON::Object::addFloat(const char name[],
float value) {
trunk/src/utils/SkJSON.cpp:void SkJSON::Object::addBool(const char name[], bool
value) {
trunk/src/utils/SkJSON.cpp:const SkJSON::Object::Slot*
SkJSON::Object::findSlot(const char name[],
trunk/src/utils/SkJSON.cpp:bool SkJSON::Object::find(const char name[], Type t)
const {
trunk/src/utils/SkJSON.cpp:bool SkJSON::Object::findObject(const char name[],
SkJSON::Object** value) const {
trunk/src/utils/SkJSON.cpp:bool SkJSON::Object::findArray(const char name[],
SkJSON::Array** value) const {
trunk/src/utils/SkJSON.cpp:bool SkJSON::Object::findString(const char name[],
SkString* value) const {
trunk/src/utils/SkJSON.cpp:bool SkJSON::Object::findInt(const char name[],
int32_t* value) const {
trunk/src/utils/SkJSON.cpp:bool SkJSON::Object::findFloat(const char name[],
float* value) const {
trunk/src/utils/SkJSON.cpp:bool SkJSON::Object::findBool(const char name[],
bool* value) const {
trunk/src/utils/SkJSON.cpp:bool SkJSON::Object::remove(const char name[], Type
t) {
trunk/src/utils/SkJSON.cpp:void SkJSON::Object::toDebugf() const {
trunk/src/utils/SkJSON.cpp:void SkJSON::Object::dumpLevel(int level) const {
trunk/src/utils/SkJSON.cpp:void SkJSON::Array::dumpLevel(int level) const {
trunk/src/utils/SkJSON.cpp:    sizeof(SkJSON::Object*),
trunk/src/utils/SkJSON.cpp:    sizeof(SkJSON::Array*),
trunk/src/utils/SkJSON.cpp:    return SkNEW_ARGS(SkJSON::Object,
(*(SkJSON::Object*)src));
trunk/src/utils/SkJSON.cpp:    return SkNEW_ARGS(SkJSON::Array,
(*(SkJSON::Array*)src));
trunk/src/utils/SkJSON.cpp:void SkJSON::Array::init(Type type, int count, const
void* src) {
trunk/src/utils/SkJSON.cpp:SkJSON::Array::Array(Type type, int count) {
trunk/src/utils/SkJSON.cpp:SkJSON::Array::Array(const int32_t values[], int
count) {
trunk/src/utils/SkJSON.cpp:SkJSON::Array::Array(const float values[], int count)
{
trunk/src/utils/SkJSON.cpp:SkJSON::Array::Array(const bool values[], int count)
{
trunk/src/utils/SkJSON.cpp:SkJSON::Array::Array(const Array& other) {
trunk/src/utils/SkJSON.cpp:    delete (SkJSON::Object*)obj;
trunk/src/utils/SkJSON.cpp:    delete (SkJSON::Array*)array;
trunk/src/utils/SkJSON.cpp:SkJSON::Array::~Array() {
trunk/src/utils/SkJSON.cpp:void SkJSON::Array::setObject(int index, Object*
object) {
trunk/src/utils/SkJSON.cpp:void SkJSON::Array::setArray(int index, Array* array)
{
trunk/src/utils/SkJSON.cpp:void SkJSON::Array::setString(int index, const char
str[]) {

[DerekS, 2012-10-30 16:01:52]

The json dependency is used by some of my experimental code for a skia document
format.  None of the code is currently in production, but having the json code
back in the tree will help with my development of the feature.

[epoger, 2012-10-30 16:03:25]

On 2012/10/30 16:01:52, DerekS wrote:
> The json dependency is used by some of my experimental code for a skia
document
> format.  None of the code is currently in production, but having the json code
> back in the tree will help with my development of the feature.

THAT SOUNDS LIKE AN LGTM TO ME

[DerekS, 2012-10-30 16:04:56]

lgtm