Fix color emoji.

Fix color emoji.

Removes the GrMaskFormat and single atlas in GrTextStrike. 
Replaces it by storing the GrMaskFormat in each GrGlyph, and 
doing a lookup for the correct atlas based on that.

Disables color glyph rendering in GrDistanceFieldTextContext 
for now.

BUG=skia:2887
Committed: https://skia.googlesource.com/skia/+/bc92163ddfe957ad6ffbb02ac40e0ba75ff82216

Committed: https://skia.googlesource.com/skia/+/294c32612d712eb56361ac5439271a91ae96862e

[jvanverth1, 2014-10-09 15:13:09]

jvanverth@google.com changed reviewers:
+ bungeman@google.com, robertphillips@google.com

[jvanverth1, 2014-10-09 15:17:28]

Distance Field text should be able to support color emoji, but that'll be in a
separate change.

[jvanverth1, 2014-10-09 15:34:27]

On 2014/10/09 15:17:28, jvanverth1 wrote:
> Distance Field text should be able to support color emoji, but that'll be in a
> separate change.

I lied -- they can't in general. But I'll figure out a fallback.

[robertphillips, 2014-10-09 16:14:53]

lgtm + questions

https://codereview.chromium.org/636183005/diff/160001/include/gpu/GrFontScaler.h
File include/gpu/GrFontScaler.h (right):

https://codereview.chromium.org/636183005/diff/160001/include/gpu/GrFontScale...
include/gpu/GrFontScaler.h:69: GrMaskFormat getMaskFormat();
Can this be const ?

https://codereview.chromium.org/636183005/diff/160001/src/gpu/GrBitmapTextCon...
File src/gpu/GrBitmapTextContext.cpp (right):

https://codereview.chromium.org/636183005/diff/160001/src/gpu/GrBitmapTextCon...
src/gpu/GrBitmapTextContext.cpp:424: 
Kind of cryptic here. The CurrMaskFormat must be from the glyph ... ?

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

https://codereview.chromium.org/636183005/diff/160001/src/gpu/GrTextStrike.cp...
src/gpu/GrTextStrike.cpp:123: SkIPoint16* loc) {
Do we need both index and atlasIndex ?

[jvanverth1, 2014-10-09 17:34:35]

https://codereview.chromium.org/636183005/diff/160001/include/gpu/GrFontScaler.h
File include/gpu/GrFontScaler.h (right):

https://codereview.chromium.org/636183005/diff/160001/include/gpu/GrFontScale...
include/gpu/GrFontScaler.h:69: GrMaskFormat getMaskFormat();
On 2014/10/09 16:14:53, robertphillips wrote:
> Can this be const ?

Done.

https://codereview.chromium.org/636183005/diff/160001/src/gpu/GrBitmapTextCon...
File src/gpu/GrBitmapTextContext.cpp (right):

https://codereview.chromium.org/636183005/diff/160001/src/gpu/GrBitmapTextCon...
src/gpu/GrBitmapTextContext.cpp:424: 
On 2014/10/09 16:14:53, robertphillips wrote:
> Kind of cryptic here. The CurrMaskFormat must be from the glyph ... ?

Done.

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

https://codereview.chromium.org/636183005/diff/160001/src/gpu/GrTextStrike.cp...
src/gpu/GrTextStrike.cpp:123: SkIPoint16* loc) {
On 2014/10/09 16:14:53, robertphillips wrote:
> Do we need both index and atlasIndex ?

Done.

[jvanverth1, 2014-10-09 17:34:39]

The CQ bit was checked by jvanverth@google.com

[commit-bot: I haz the power, 2014-10-09 17:34:49]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/636183005/180001

[commit-bot: I haz the power, 2014-10-09 17:34:53]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-10-09 17:34:54]

Presubmit check for 636183005-180001 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', 'djsollen@chromium.org', 'djsollen@google.com')

[jvanverth1, 2014-10-09 17:37:45]

jvanverth@google.com changed reviewers:
+ reed@google.com

[jvanverth1, 2014-10-09 17:37:46]

Adding reed@.

[jvanverth1, 2014-10-10 12:36:22]

jvanverth@google.com changed reviewers:
+ bsalomon@google.com

[jvanverth1, 2014-10-10 12:36:22]

Adding bsalomon@. This is for a P1 issue in Chrome.

[reed1, 2014-10-10 14:24:25]

lgtm wdoik (what-do-I-know)

https://codereview.chromium.org/636183005/diff/320001/include/gpu/GrGlyph.h
File include/gpu/GrGlyph.h (right):

https://codereview.chromium.org/636183005/diff/320001/include/gpu/GrGlyph.h#n...
include/gpu/GrGlyph.h:31: GrMaskFormat fMaskFormat;
note for the future : can we pack mask-format somewhere into PackedID, so we
don't have to grow the size of this struct?

[bsalomon, 2014-10-10 14:46:26]

lgtm

[jvanverth1, 2014-10-10 15:10:15]

https://codereview.chromium.org/636183005/diff/320001/include/gpu/GrGlyph.h
File include/gpu/GrGlyph.h (right):

https://codereview.chromium.org/636183005/diff/320001/include/gpu/GrGlyph.h#n...
include/gpu/GrGlyph.h:31: GrMaskFormat fMaskFormat;
On 2014/10/10 14:24:25, reed1 wrote:
> note for the future : can we pack mask-format somewhere into PackedID, so we
> don't have to grow the size of this struct?

PackedID is effectively 20 bits (16 bit glyph id + subpixel x and y), so this
should be possible.

[jvanverth1, 2014-10-10 15:12:19]

The CQ bit was checked by jvanverth@google.com

[commit-bot: I haz the power, 2014-10-10 15:12:45]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/636183005/320001

[commit-bot: I haz the power, 2014-10-10 15:21:36]

Committed patchset #11 (id:320001) as bc92163ddfe957ad6ffbb02ac40e0ba75ff82216

[jvanverth1, 2014-10-10 15:51:10]

A revert of this CL (patchset #11 id:320001) has been created in
https://codereview.chromium.org/640413004/ by jvanverth@google.com.

The reason for reverting is: Crashing the Windows bots..

[jvanverth1, 2014-10-10 18:27:38]

The CQ bit was checked by jvanverth@google.com

[commit-bot: I haz the power, 2014-10-10 18:28:11]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/636183005/480001

[commit-bot: I haz the power, 2014-10-10 18:36:37]

Committed patchset #12 (id:480001) as 294c32612d712eb56361ac5439271a91ae96862e