From ed87fa2a2d7afe9e04c49c931c862dd3c550424c Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Fri, 19 Feb 2016 17:56:44 -0500 Subject: [PATCH] Use android_memset32 instead of sk_memset32. Android code should use the Android version. Also, Skia is interested in making sk_memset32 private. BUG:27290333 Change-Id: Id5c8bc190cdd21673c8844eaa48e8b6a93e2e9df --- libs/hwui/utils/TestWindowContext.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/hwui/utils/TestWindowContext.cpp b/libs/hwui/utils/TestWindowContext.cpp index b0431ce77f058..9ee5fc64b8931 100644 --- a/libs/hwui/utils/TestWindowContext.cpp +++ b/libs/hwui/utils/TestWindowContext.cpp @@ -28,6 +28,7 @@ #include "gui/Surface.h" #include "renderthread/RenderProxy.h" +#include namespace { @@ -119,8 +120,8 @@ public: SkImageInfo::Make(mSize.width(), mSize.height(), kRGBA_8888_SkColorType, kPremul_SkAlphaType); bmp->allocPixels(destinationConfig); - sk_memset32((uint32_t*) bmp->getPixels(), SK_ColorRED, - mSize.width() * mSize.height()); + android_memset32((uint32_t*) bmp->getPixels(), SK_ColorRED, + mSize.width() * mSize.height() * 4); android::CpuConsumer::LockedBuffer nativeBuffer; android::status_t retval = mCpuConsumer->lockNextBuffer(&nativeBuffer);