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

Commit 241828e8 authored by Tom Hudson's avatar Tom Hudson Committed by Android (Google) Code Review
Browse files

Merge "Replace SkALWAYSBREAK with equivalent Android macros."

parents 67a55fdb a3f16d43

libs/hwui/utils/TestWindowContext.cpp

+4 −4
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ public: 


        // Move the pixels into the destination SkBitmap



        SK_ALWAYSBREAK(nativeBuffer.format == android::PIXEL_FORMAT_RGBA_8888 &&

        LOG_ALWAYS_FATAL_IF(nativeBuffer.format != android::PIXEL_FORMAT_RGBA_8888,

                            "Native buffer not RGBA!");

        SkImageInfo nativeConfig =

            SkImageInfo::Make(nativeBuffer.width, nativeBuffer.height,
@@ -153,7 +153,7 @@ public: 
            return false;

        }



        SK_ALWAYSBREAK(bmp->colorType() == kRGBA_8888_SkColorType &&

        LOG_ALWAYS_FATAL_IF(bmp->colorType() != kRGBA_8888_SkColorType,

                            "Destination buffer not RGBA!");

        success =

            nativeWrapper.readPixels(destinationConfig, bmp->getPixels(), bmp->rowBytes(), 0, 0);