diff --git a/libs/hwui/AutoBackendTextureRelease.h b/libs/hwui/AutoBackendTextureRelease.h
index acdd63c..06f51fc 100644
--- a/libs/hwui/AutoBackendTextureRelease.h
+++ b/libs/hwui/AutoBackendTextureRelease.h
@@ -31,7 +31,8 @@
  */
 class AutoBackendTextureRelease final {
 public:
-    AutoBackendTextureRelease(GrContext* context, AHardwareBuffer* buffer);
+    AutoBackendTextureRelease(GrDirectContext* context,
+                              AHardwareBuffer* buffer);
 
     const GrBackendTexture& getTexture() const { return mBackendTexture; }
 
@@ -42,9 +43,11 @@
 
     inline sk_sp<SkImage> getImage() const { return mImage; }
 
-    void makeImage(AHardwareBuffer* buffer, android_dataspace dataspace, GrContext* context);
+    void makeImage(AHardwareBuffer* buffer,
+                   android_dataspace dataspace,
+                   GrDirectContext* context);
 
-    void newBufferContent(GrContext* context);
+    void newBufferContent(GrDirectContext* context);
 
 private:
     // The only way to invoke dtor is with unref, when mUsageCount is 0.
