Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc18f289 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Disable debugging code in the font renderer"

parents 7042613c b629490f

libs/hwui/Debug.h

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ 
// Turn on to display debug info about the layer renderer

#define DEBUG_LAYER_RENDERER 0



// Turn on to enable additional debugging in the font renderers

#define DEBUG_FONT_RENDERER 0



// Turn on to dump display list state

#define DEBUG_DISPLAY_LIST 0

libs/hwui/FontRenderer.cpp

+3 −1
Original line number Diff line number Diff line
@@ -151,10 +151,12 @@ void Font::drawCachedGlyphBitmap(CachedGlyphInfo* glyph, int x, int y, 
    int32_t bX = 0, bY = 0;

    for (cacheX = glyph->mStartX, bX = nPenX; cacheX < endX; cacheX++, bX++) {

        for (cacheY = glyph->mStartY, bY = nPenY; cacheY < endY; cacheY++, bY++) {

#if DEBUG_FONT_RENDERER

            if (bX < 0 || bY < 0 || bX >= (int32_t) bitmapW || bY >= (int32_t) bitmapH) {

                ALOGE("Skipping invalid index");

                continue;

            }

#endif

            uint8_t tempCol = cacheBuffer[cacheY * cacheWidth + cacheX];

            bitmap[bY * bitmapW + bX] = tempCol;

        }
@@ -226,7 +228,7 @@ void Font::render(SkPaint* paint, const char* text, uint32_t start, uint32_t len 
    };

    RenderGlyph render = gRenderGlyph[mode];



    if (positions == NULL) {

    if (CC_LIKELY(positions == NULL)) {

        SkFixed prevRsbDelta = 0;



        float penX = x;