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

Commit d7f13f84 authored by Derek Sollenberger's avatar Derek Sollenberger
Browse files

Prematurely optimizing a Path. 

If the path had an inverse fill type we were incorrectly
converting ovals and roundRects to their primitive form
without checking to ensure the path was not inverse fill.

This CL removes these optimizations as they happen internally
within Skia.

Bug: 34245907
Test: verified broken app is fixed and that skia has existing tests
Change-Id: I8c1ff6522ae19fc6c21520adc7e9bc2473a8a4ad
parent 748bf772

libs/hwui/SkiaCanvas.cpp

+1 −9
Original line number Diff line number Diff line
@@ -512,16 +512,8 @@ void SkiaCanvas::drawArc(float left, float top, float right, float bottom, 


void SkiaCanvas::drawPath(const SkPath& path, const SkPaint& paint) {

    if (CC_UNLIKELY(paint.nothingToDraw())) return;

    SkRect rect;

    SkRRect roundRect;

    if (path.isOval(&rect)) {

        mCanvas->drawOval(rect, paint);

    } else if (path.isRRect(&roundRect)) {

        mCanvas->drawRRect(roundRect, paint);

    } else {

    mCanvas->drawPath(path, paint);

}

}



void SkiaCanvas::drawVertices(SkCanvas::VertexMode vertexMode, int vertexCount,

                              const float* verts, const float* texs, const int* colors,