Merge "GIFMovie: Stop using internal Skia APIs"

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 @@ static void fillRect(SkBitmap* bm, GifWord left, GifWord top, GifWord width, Gif
         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;
     }
 }