commit c6fe3efe6c9c9356843860863a0fb4114536b86c
author Leon Scroggins III <scroggo@google.com> Mon Nov 01 10:47:28 2021 -0400
committer Leon Scroggins III <scroggo@google.com> Tue Nov 02 11:01:07 2021 -0400
tree 6dee90862e34dd1ead8d7e4b9c334069255bb228
parent c27e4cdfa39babc7357edd980f9219cf8ac81a0e

GIFMovie: Stop using internal Skia APIs

Bug: 178700363
Test: manual

Instead of using sk_memset32, which is private to Skia, use regular
memset. Skia recently moved sk_memset32, resulting in a build breakage.
But it's not obvious that this deprecated class needs the faster version
of memset.

Also remove an include of SkTemplates, which is no longer used.

Change-Id: Iae6b495e5aace3ea92d2fc59798ea3fd23d3b1b9

libs/hwui/jni/GIFMovie.cpp

diff --git a/libs/hwui/jni/GIFMovie.cpp b/libs/hwui/jni/GIFMovie.cpp
index c5c4711..fef51b8 100644
--- a/libs/hwui/jni/GIFMovie.cpp
+++ b/libs/hwui/jni/GIFMovie.cpp
@@ -10,13 +10,13 @@
 #include "SkColor.h"
 #include "SkColorPriv.h"
 #include "SkStream.h"
-#include "SkTemplates.h"
-#include "SkUtils.h"
 
 #include "gif_lib.h"
 
 #include <log/log.h>
 
+#include <string.h>
+
 #if GIFLIB_MAJOR < 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR == 0)
 #define DGifCloseFile(a, b) DGifCloseFile(a)
 #endif
@@ -219,8 +219,9 @@
         copyHeight = bmHeight - top;
     }
 
+    size_t bytes = copyWidth * SkColorTypeBytesPerPixel(bm->colorType());
     for (; copyHeight > 0; copyHeight--) {
-        sk_memset32(dst, col, copyWidth);
+        memset(dst, col, bytes);
         dst += bmWidth;
     }
 }