Merge "Correct stride for drawing to cached glyph bitmap"

    int dstY = y + glyph->mBitmapTop;

    CacheTexture* cacheTexture = glyph->mCacheTexture;

    PixelBuffer* pixelBuffer = cacheTexture->getPixelBuffer();

    uint32_t formatSize = PixelBuffer::formatSize(pixelBuffer->getFormat());

    uint32_t cacheWidth = cacheTexture->getWidth();

    uint32_t startY = glyph->mStartY * cacheWidth;

    uint32_t endY = startY + (glyph->mBitmapHeight * cacheWidth);

    uint32_t srcStride = formatSize * cacheWidth;

    uint32_t startY = glyph->mStartY * srcStride;

    uint32_t endY = startY + (glyph->mBitmapHeight * srcStride);

    PixelBuffer* pixelBuffer = cacheTexture->getPixelBuffer();

    const uint8_t* cacheBuffer = pixelBuffer->map();

    for (uint32_t cacheY = startY, bitmapY = dstY * bitmapWidth; cacheY < endY;

            cacheY += cacheWidth, bitmapY += bitmapWidth) {

            cacheY += srcStride, bitmapY += bitmapWidth) {

        if (formatSize == 1) {

            memcpy(&bitmap[bitmapY + dstX], &cacheBuffer[cacheY + glyph->mStartX], glyph->mBitmapWidth);

        } else {

            for (uint32_t i = 0; i < glyph->mBitmapWidth; ++i) {

                bitmap[bitmapY + dstX + i] = cacheBuffer[cacheY + (glyph->mStartX + i)*formatSize];

            }

        }

    }

}

void Font::drawCachedGlyph(CachedGlyphInfo* glyph, float x, float hOffset, float vOffset,

        SkPathMeasure& measure, SkPoint* position, SkVector* tangent) {