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

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

Merge "Round scale factors to rasterize text" into jb-mr2-dev

parents 098b3ba5 8afce816

libs/hwui/DisplayList.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -442,9 +442,8 @@ status_t DisplayList::replay(OpenGLRenderer& renderer, Rect& dirty, int32_t flag 
    for (unsigned int i = 0; i < mDisplayListData->displayListOps.size(); i++) {

    for (unsigned int i = 0; i < mDisplayListData->displayListOps.size(); i++) {

        DisplayListOp *op = mDisplayListData->displayListOps[i];

        DisplayListOp *op = mDisplayListData->displayListOps[i];

#if DEBUG_DISPLAY_LIST_OPS_AS_EVENTS

#if DEBUG_DISPLAY_LIST_OPS_AS_EVENTS

        Caches::getInstance().eventMark(strlen(op->name()), op->name());

        renderer.eventMark(strlen(op->name()), op->name());

#endif

#endif



        drawGlStatus |= op->replay(renderer, dirty, flags,

        drawGlStatus |= op->replay(renderer, dirty, flags,

                saveCount, level, mCaching, mMultipliedAlpha, deferredList);

                saveCount, level, mCaching, mMultipliedAlpha, deferredList);

        logBuffer.writeCommand(level, op->name());

        logBuffer.writeCommand(level, op->name());

libs/hwui/font/Font.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -53,8 +53,8 @@ Font::FontDescription::FontDescription(const SkPaint* paint, const mat4& matrix) 
    mStrokeWidth = paint->getStrokeWidth();

    mStrokeWidth = paint->getStrokeWidth();

    mAntiAliasing = paint->isAntiAlias();

    mAntiAliasing = paint->isAntiAlias();

    mLookupTransform.reset();

    mLookupTransform.reset();

    mLookupTransform[SkMatrix::kMScaleX] = matrix[mat4::kScaleX];

    mLookupTransform[SkMatrix::kMScaleX] = roundf(fmaxf(1.0f, matrix[mat4::kScaleX]));

    mLookupTransform[SkMatrix::kMScaleY] = matrix[mat4::kScaleY];

    mLookupTransform[SkMatrix::kMScaleY] = roundf(fmaxf(1.0f, matrix[mat4::kScaleY]));

    if (!mLookupTransform.invert(&mInverseLookupTransform)) {

    if (!mLookupTransform.invert(&mInverseLookupTransform)) {

        ALOGW("Could not query the inverse lookup transform for this font");

        ALOGW("Could not query the inverse lookup transform for this font");

    }

    }