Merged https://codereview.chromium.org/922273002/ to M41

Merged https://codereview.chromium.org/922273002/ to M41

NOTREECHECKS=true
NOTRY=true

BUG=464672
Committed: https://skia.googlesource.com/skia/+/aa7b421902ec33245cb1f4b65d76860187dec7ef

[sugoi1, 2015-03-10 14:58:19]

sugoi@chromium.org changed reviewers:
+ robertphillips@chromium.org

[sugoi1, 2015-03-10 14:58:20]

https://codereview.chromium.org/977273003/diff/1/src/ports/SkFontHost_FreeTyp...
File src/ports/SkFontHost_FreeType_common.cpp (right):

https://codereview.chromium.org/977273003/diff/1/src/ports/SkFontHost_FreeTyp...
src/ports/SkFontHost_FreeType_common.cpp:181: SkASSERT(dstMask.fBounds.height()
== static_cast<int>(srcFTBitmap.rows));
I had to also add this small fix (that's already in ToT) just to be able to
build in Debug

[sugoi1, 2015-03-10 20:06:38]

sugoi@chromium.org changed reviewers:
+ bsalomon@google.com

[sugoi1, 2015-03-10 20:06:38]

Ok, it's been merge approved. If I could get another pair of eyes to look at it
before I merge to make sure I didn't do anything stupid, that would be great :)

[robertphillips, 2015-03-10 20:48:44]

robertphillips@google.com changed reviewers:
+ robertphillips@google.com

[robertphillips, 2015-03-10 20:48:44]

lgtm

[sugoi1, 2015-03-10 20:52:29]

The CQ bit was checked by sugoi@chromium.org

[commit-bot: I haz the power, 2015-03-10 20:53:35]

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

[commit-bot: I haz the power, 2015-03-10 20:53:35]

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

[commit-bot: I haz the power, 2015-03-10 20:53:36]

CLs for remote refs other than refs/heads/master must contain NOTRY=true in
order for the CQ to process them

[sugoi1, 2015-03-10 20:57:12]

The CQ bit was checked by sugoi@chromium.org

[commit-bot: I haz the power, 2015-03-10 20:57:34]

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

[sugoi1, 2015-03-11 11:57:14]

The CQ bit was unchecked by sugoi@chromium.org

[sugoi1, 2015-03-11 11:57:16]

The CQ bit was checked by sugoi@chromium.org

[commit-bot: I haz the power, 2015-03-11 11:57:24]

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

[sugoi1, 2015-03-11 12:15:06]

The CQ bit was unchecked by sugoi@chromium.org

[sugoi1, 2015-03-11 12:15:18]

The CQ bit was checked by sugoi@chromium.org

[commit-bot: I haz the power, 2015-03-11 12:15:25]

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

[commit-bot: I haz the power, 2015-03-11 12:15:36]

Committed patchset #1 (id:1) as
https://skia.googlesource.com/skia/+/aa7b421902ec33245cb1f4b65d76860187dec7ef