extract some common code from PictureRenderer

extract some common code from PictureRenderer

Committed: http://code.google.com/p/skia/source/detail?r=14638

[epoger, 2014-05-07 22:10:41]

Eric- PTAL at patchset 2.

https://codereview.chromium.org/273703006/diff/20001/gm/gm_expectations.cpp
File gm/gm_expectations.cpp (left):

https://codereview.chromium.org/273703006/diff/20001/gm/gm_expectations.cpp#o...
gm/gm_expectations.cpp:222: /*static*/ SkData*
JsonExpectationsSource::ReadIntoSkData(SkStream &stream, size_t maxBytes) {
Moved to SkDataUtils.cpp

https://codereview.chromium.org/273703006/diff/20001/gm/gm_expectations.h
File gm/gm_expectations.h (left):

https://codereview.chromium.org/273703006/diff/20001/gm/gm_expectations.h#old...
gm/gm_expectations.h:219: * Read as many bytes as possible (up to maxBytes) from
the stream into
Moved to SkDataUtils.h

https://codereview.chromium.org/273703006/diff/20001/gm/gm_expectations.h
File gm/gm_expectations.h (right):

https://codereview.chromium.org/273703006/diff/20001/gm/gm_expectations.h#new...
gm/gm_expectations.h:1: /*
Extracted this CL from https://codereview.chromium.org/261313004/ ('add
--readJsonSummaryPath to render_pictures') ...

This one just contains the refactoring, no change in behavior.

https://codereview.chromium.org/273703006/diff/20001/tools/PictureRenderer.cpp
File tools/PictureRenderer.cpp (left):

https://codereview.chromium.org/273703006/diff/20001/tools/PictureRenderer.cp...
tools/PictureRenderer.cpp:51: /*
moved to image_expectations.cpp

https://codereview.chromium.org/273703006/diff/20001/tools/PictureRenderer.h
File tools/PictureRenderer.h (left):

https://codereview.chromium.org/273703006/diff/20001/tools/PictureRenderer.h#...
tools/PictureRenderer.h:41: /**
moved to image_expectations.h

[borenet, 2014-05-08 12:05:53]

Thanks, this is much easier to parse.  LGTM but wondering whether some constants
should be in the header file instead...

https://codereview.chromium.org/273703006/diff/20001/tools/PictureRenderer.cpp
File tools/PictureRenderer.cpp (right):

https://codereview.chromium.org/273703006/diff/20001/tools/PictureRenderer.cp...
tools/PictureRenderer.cpp:309: outputFilename.set("bitmap-64bitMD5_");
Why the change to the literal?  Couldn't the variable go in image_expectations.h
so that it can be used here?

[epoger, 2014-05-08 14:40:24]

https://codereview.chromium.org/273703006/diff/20001/tools/PictureRenderer.cpp
File tools/PictureRenderer.cpp (right):

https://codereview.chromium.org/273703006/diff/20001/tools/PictureRenderer.cp...
tools/PictureRenderer.cpp:309: outputFilename.set("bitmap-64bitMD5_");
On 2014/05/08 12:05:53, borenet wrote:
> Why the change to the literal?  Couldn't the variable go in
image_expectations.h
> so that it can be used here?

Damn you and your sharp eyes.  I have added a TODO indicating that this is
temporary.

[epoger, 2014-05-08 14:40:36]

The CQ bit was checked by epoger@google.com

[commit-bot: I haz the power, 2014-05-08 14:41:23]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/epoger@google.com/273703006/40001

[commit-bot: I haz the power, 2014-05-08 14:49:01]

Change committed as 14638

[djsollen, 2014-05-08 16:22:35]

A revert of this CL has been created in
https://codereview.chromium.org/274463004/ by djsollen@google.com.

The reason for reverting is: breaking the android debug builds.  It seems to be
the result of android using shared libs and not lumping everything into one big
static lib or executable. So we have more than one copy of SkString which is the
root of the issue..

[bungeman-skia, 2014-05-08 16:25:27]

By including utils here you have one build of utils in the lib and a different
one statically linked to tools/gm. As a result you have two different empty
SkStrings and there can be only one.

https://codereview.chromium.org/273703006/diff/40001/gyp/gm.gyp
File gyp/gm.gyp (right):

https://codereview.chromium.org/273703006/diff/40001/gyp/gm.gyp#newcode20
gyp/gm.gyp:20: 'utils.gyp:utils',
Can't do this, already in skia_lib.gyp.

https://codereview.chromium.org/273703006/diff/40001/gyp/tools.gyp
File gyp/tools.gyp (right):

https://codereview.chromium.org/273703006/diff/40001/gyp/tools.gyp#newcode403
gyp/tools.gyp:403: 'utils.gyp:utils',
Can't do this, already in skia_lib.gyp.

[bungeman-skia, 2014-05-08 16:29:50]

https://codereview.chromium.org/273703006/diff/40001/gm/gm_expectations.cpp
File gm/gm_expectations.cpp (right):

https://codereview.chromium.org/273703006/diff/40001/gm/gm_expectations.cpp#n...
gm/gm_expectations.cpp:234: SkAutoDataUnref
dataRef(SkDataUtils::ReadFileIntoSkData(inFile));
Why isn't this just SkData::NewFromFileName(jsonPath);?