From dd8b2ea5a60fc0106e530d0e047a44de89b0cb4a Mon Sep 17 00:00:00 2001
From: Kevin Lubick <kjlubick@google.com>
Date: Fri, 17 Mar 2023 19:55:58 +0000
Subject: Migrate SkImage static methods to SkImages namespace

Will need to land after
https://skia-review.googlesource.com/c/skia/+/648297
lands and rolls

Change-Id: Ie2ecb8f74dd52fcdd35e7cf9c311e8ed94781a07
Bug: skbug.com/13983
---
 libs/hwui/HardwareBitmapUploader.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'libs/hwui/HardwareBitmapUploader.cpp')

diff --git a/libs/hwui/HardwareBitmapUploader.cpp b/libs/hwui/HardwareBitmapUploader.cpp
index b7e99994355c..19a1dfa91539 100644
--- a/libs/hwui/HardwareBitmapUploader.cpp
+++ b/libs/hwui/HardwareBitmapUploader.cpp
@@ -25,6 +25,7 @@
 #include <SkBitmap.h>
 #include <SkCanvas.h>
 #include <SkImage.h>
+#include <SkImageAndroid.h>
 #include <SkImageInfo.h>
 #include <SkRefCnt.h>
 #include <gui/TraceUtils.h>
@@ -262,7 +263,8 @@ private:
           }
 
           sk_sp<SkImage> image =
-              SkImage::MakeFromAHardwareBufferWithData(mGrContext.get(), bitmap.pixmap(), ahb);
+              SkImages::TextureFromAHardwareBufferWithData(mGrContext.get(), bitmap.pixmap(),
+                                                           ahb);
           mGrContext->submit(true);
 
           uploadSucceeded = (image.get() != nullptr);
-- 
cgit v1.2.3-59-g8ed1b