diff options
| author | 2016-01-25 16:33:59 +0000 | |
|---|---|---|
| committer | 2016-01-25 16:33:59 +0000 | |
| commit | 241828e8c745c7d453d5d15b5f5b84658c56b5db (patch) | |
| tree | fe67d698473c44fb070a98c2113e71c308a69f19 /libs/hwui | |
| parent | 67a55fdb05b8f9b178de0f9e650a2ed1aa661b7f (diff) | |
| parent | a3f16d43770e6740dd27210875964d91985efbd2 (diff) | |
Merge "Replace SkALWAYSBREAK with equivalent Android macros."
Diffstat (limited to 'libs/hwui')
| -rw-r--r-- | libs/hwui/utils/TestWindowContext.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/hwui/utils/TestWindowContext.cpp b/libs/hwui/utils/TestWindowContext.cpp index dcc49469b7f2..b0431ce77f05 100644 --- a/libs/hwui/utils/TestWindowContext.cpp +++ b/libs/hwui/utils/TestWindowContext.cpp @@ -138,8 +138,8 @@ public: // Move the pixels into the destination SkBitmap - SK_ALWAYSBREAK(nativeBuffer.format == android::PIXEL_FORMAT_RGBA_8888 && - "Native buffer not RGBA!"); + LOG_ALWAYS_FATAL_IF(nativeBuffer.format != android::PIXEL_FORMAT_RGBA_8888, + "Native buffer not RGBA!"); SkImageInfo nativeConfig = SkImageInfo::Make(nativeBuffer.width, nativeBuffer.height, kRGBA_8888_SkColorType, kPremul_SkAlphaType); @@ -153,8 +153,8 @@ public: return false; } - SK_ALWAYSBREAK(bmp->colorType() == kRGBA_8888_SkColorType && - "Destination buffer not RGBA!"); + LOG_ALWAYS_FATAL_IF(bmp->colorType() != kRGBA_8888_SkColorType, + "Destination buffer not RGBA!"); success = nativeWrapper.readPixels(destinationConfig, bmp->getPixels(), bmp->rowBytes(), 0, 0); if (!success) { |