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

Commit c73741c3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Cleanup asserts and remove usage of deprecated data structure."

parents 62f63481 e547dd0b

libs/hwui/SkiaCanvas.cpp

+1 −1
Original line number Diff line number Diff line
@@ -738,7 +738,7 @@ void SkiaCanvas::drawGlyphs(const uint16_t* text, const float* positions, int co 
void SkiaCanvas::drawLayoutOnPath(const minikin::Layout& layout, float hOffset, float vOffset,

        const SkPaint& paint, const SkPath& path, size_t start, size_t end) {

    const int N = end - start;

    SkAutoSMalloc<1024> storage(N * (sizeof(uint16_t) + sizeof(SkRSXform)));

    SkAutoSTMalloc<1024, uint8_t> storage(N * (sizeof(uint16_t) + sizeof(SkRSXform)));

    SkRSXform* xform = (SkRSXform*)storage.get();

    uint16_t* glyphs = (uint16_t*)(xform + N);

    SkPathMeasure meas(path, false);

libs/hwui/pipeline/skia/ReorderBarrierDrawables.cpp

+2 −2
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static void DrawSpotShadowGeneral(SkCanvas* canvas, const Shape& shape, float ca 
static void DrawRRectShadows(const SkRect& casterRect, SkScalar casterCornerRadius,

        SkScalar ambientAlpha, SkScalar spotAlpha, SkScalar casterAlpha, SkScalar casterZValue,

        SkScalar scaleFactor, SkCanvas* canvas) {

    SkASSERT(cornerRadius >= 0.0f);

    SkASSERT(casterCornerRadius >= 0.0f);



    // For all of these, we need to ensure we have a rrect with radius >= 0.5f in device space

    const SkScalar minRadius = 0.5f / scaleFactor;
@@ -387,7 +387,7 @@ static void DrawRRectShadows(const SkRect& casterRect, SkScalar casterCornerRadi 
static void DrawRRectShadowsWithClip(const SkRect& casterRect, SkScalar casterCornerRadius,

        SkScalar ambientAlpha, SkScalar spotAlpha, SkScalar casterZValue, SkScalar scaleFactor,

        const SkRRect& clipRR, SkCanvas* canvas) {

    SkASSERT(cornerRadius >= 0.0f);

    SkASSERT(casterCornerRadius >= 0.0f);



    const bool isOval = casterCornerRadius >= std::max(SkScalarHalf(casterRect.width()),

            SkScalarHalf(casterRect.height()));