Add GPU support for color bitmap fonts

Add GPU support for color bitmap fonts

BUG=skia:1869
Committed: http://code.google.com/p/skia/source/detail?r=12471

[bungeman-skia, 2013-12-02 20:59:22]

lgtm, though my lgtm doesn't carry much weight here.

[robertphillips, 2013-12-02 21:05:40]

lgtm + suggestions

https://codereview.chromium.org/99993002/diff/60001/include/gpu/GrTypes.h
File include/gpu/GrTypes.h (right):

https://codereview.chromium.org/99993002/diff/60001/include/gpu/GrTypes.h#new...
include/gpu/GrTypes.h:255: // kARGB (3) -> 4
can we have a static assert here r.e. "4 == kLast_GrMaskFormat+1"?
static const?

https://codereview.chromium.org/99993002/diff/60001/src/gpu/GrTextStrike.cpp
File src/gpu/GrTextStrike.cpp (right):

https://codereview.chromium.org/99993002/diff/60001/src/gpu/GrTextStrike.cpp#...
src/gpu/GrTextStrike.cpp:49: static GrPixelConfig
mask_format_to_pixel_config(GrMaskFormat format) {
const?

https://codereview.chromium.org/99993002/diff/60001/src/gpu/GrTextStrike.cpp#...
src/gpu/GrTextStrike.cpp:60: static int mask_format_to_atlas_index(GrMaskFormat
format) {
const?

https://codereview.chromium.org/99993002/diff/60001/src/gpu/GrTextStrike.cpp#...
src/gpu/GrTextStrike.cpp:61: static int sAtlasIndices[kMaskFormatCount] = { 0,
1, 2, 2 };
assert "sAtlasIndices[format] < kAtlasCount" or a static equivalent?

https://codereview.chromium.org/99993002/diff/60001/src/gpu/GrTextStrike.cpp#...
src/gpu/GrTextStrike.cpp:70: int atlasIndex =
mask_format_to_atlas_index(format);
Move assert up into mask_format_to_atlas?

https://codereview.chromium.org/99993002/diff/60001/src/gpu/GrTextStrike.h
File src/gpu/GrTextStrike.h (right):

https://codereview.chromium.org/99993002/diff/60001/src/gpu/GrTextStrike.h#ne...
src/gpu/GrTextStrike.h:112: friend class GrFontPurgeListener;
// The current set of atlases are: ...?

[commit-bot: I haz the power, 2013-12-03 18:35:29]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/jvanverth@google.com/99993002/100001

[commit-bot: I haz the power, 2013-12-03 18:35:32]

Presubmit check for 99993002-100001 failed and returned exit status 1.

Running presubmit commit checks ...

** Presubmit ERRORS **
Since the CL is editing public API, you must have an LGTM from one of:
('reed@chromium.org', 'reed@google.com', 'bsalomon@chromium.org',
'bsalomon@google.com')

Was the presubmit check useful? Please send feedback & hate mail to
maruel@chromium.org!

[jvanverth1, 2013-12-03 18:38:49]

For Brian to look at.

[bsalomon, 2013-12-03 18:52:10]

https://codereview.chromium.org/99993002/diff/100001/include/gpu/GrTypes.h
File include/gpu/GrTypes.h (right):

https://codereview.chromium.org/99993002/diff/100001/include/gpu/GrTypes.h#ne...
include/gpu/GrTypes.h:237: enum GrMaskFormat {
Is this enum useful and does it belong in this header?

[bsalomon, 2013-12-03 19:10:43]

lgtm

[jvanverth1, 2013-12-03 19:11:37]

https://codereview.chromium.org/99993002/diff/100001/include/gpu/GrTypes.h
File include/gpu/GrTypes.h (right):

https://codereview.chromium.org/99993002/diff/100001/include/gpu/GrTypes.h#ne...
include/gpu/GrTypes.h:237: enum GrMaskFormat {
On 2013/12/03 18:52:10, bsalomon wrote:
> Is this enum useful and does it belong in this header?

I don't think it needs to be public, but I suggest making that part of a
separate change.

[commit-bot: I haz the power, 2013-12-03 19:13:19]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/jvanverth@google.com/99993002/100001

[commit-bot: I haz the power, 2013-12-03 19:45:25]

Change committed as 12471