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

Commit 18b388d6 authored by Stan Iliev's avatar Stan Iliev
Browse files

Fix incorrect asserts 

Fix a few Skia asserts, which prevent HWUI from compiling and
running when SkDebug is defined.

Test: Built and ran Android on device.
Change-Id: Ie7f16016ba105e1d376c266c5b030e4bc04629d9
parent a554ba6e

core/jni/android/graphics/NinePatch.cpp

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ public: 
            jlong chunkHandle, jobject dstRect) {

        Res_png_9patch* chunk = reinterpret_cast<Res_png_9patch*>(chunkHandle);

        SkASSERT(chunk);

        SkASSERT(boundsRect);



        SkBitmap bitmap;

        GraphicsJNI::getSkBitmap(env, jbitmap, &bitmap);

libs/hwui/pipeline/skia/ReorderBarrierDrawables.cpp

+0 −3
Original line number Diff line number Diff line
@@ -51,8 +51,6 @@ void StartReorderBarrierDrawable::onDraw(SkCanvas* canvas) { 
            return aZValue < bZValue;

        });



    SkASSERT(!mChildren.empty());



    size_t drawIndex = 0;

    const size_t endIndex = mChildren.size();

    while (drawIndex < endIndex) {
@@ -76,7 +74,6 @@ EndReorderBarrierDrawable::EndReorderBarrierDrawable(StartReorderBarrierDrawable 


void EndReorderBarrierDrawable::onDraw(SkCanvas* canvas) {

    auto& zChildren = mStartBarrier->mChildren;

    SkASSERT(!zChildren.empty());



    /**

     * Draw shadows and (potential) casters mostly in order, but allow the shadows of casters

libs/hwui/pipeline/skia/SkiaPipeline.cpp

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ void SkiaPipeline::renderLayersImpl(const LayerUpdateQueue& layers, 
            SkASSERT(layerNode->getDisplayList()->isSkiaDL());

            SkiaDisplayList* displayList = (SkiaDisplayList*)layerNode->getDisplayList();

            if (!displayList || displayList->isEmpty()) {

                SkDEBUGF(("%p drawLayers(%s) : missing drawable", this, layerNode->getName()));

                SkDEBUGF(("%p drawLayers(%s) : missing drawable", layerNode, layerNode->getName()));

                return;

            }