Fix clang_tidy lints (flutter#44740)

gaaclarke · Aug 30, 2023 · 6b739bf · 6b739bf
1 parent 0f96770
commit 6b739bf
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/shell/platform/android/surface_texture_external_texture.cc b/shell/platform/android/surface_texture_external_texture.cc
@@ -24,9 +24,9 @@ namespace flutter {
 SurfaceTextureExternalTexture::SurfaceTextureExternalTexture(
     int64_t id,
     const fml::jni::ScopedJavaGlobalRef<jobject>& surface_texture,
-    std::shared_ptr<PlatformViewAndroidJNI> jni_facade)
+    const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade)
     : Texture(id),
-      jni_facade_(std::move(jni_facade)),
+      jni_facade_(jni_facade),
       surface_texture_(surface_texture),
       transform_(SkMatrix::I()) {}
 

diff --git a/shell/platform/android/surface_texture_external_texture.h b/shell/platform/android/surface_texture_external_texture.h
@@ -18,7 +18,7 @@ class SurfaceTextureExternalTexture : public flutter::Texture {
   SurfaceTextureExternalTexture(
       int64_t id,
       const fml::jni::ScopedJavaGlobalRef<jobject>& surface_texture,
-      std::shared_ptr<PlatformViewAndroidJNI> jni_facade);
+      const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade);
 
   ~SurfaceTextureExternalTexture() override;
 

diff --git a/shell/platform/android/surface_texture_external_texture_gl.cc b/shell/platform/android/surface_texture_external_texture_gl.cc
@@ -24,11 +24,13 @@ namespace flutter {
 SurfaceTextureExternalTextureGL::SurfaceTextureExternalTextureGL(
     int64_t id,
     const fml::jni::ScopedJavaGlobalRef<jobject>& surface_texture,
-    std::shared_ptr<PlatformViewAndroidJNI> jni_facade)
+    const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade)
     : SurfaceTextureExternalTexture(id, surface_texture, jni_facade) {}
 
 SurfaceTextureExternalTextureGL::~SurfaceTextureExternalTextureGL() {
-  Detach();
+  if (texture_name_ != 0) {
+    glDeleteTextures(1, &texture_name_);
+  }
 }
 
 void SurfaceTextureExternalTextureGL::ProcessFrame(PaintContext& context,
@@ -66,14 +68,12 @@ SurfaceTextureExternalTextureImpellerGL::
         const std::shared_ptr<impeller::ContextGLES>& context,
         int64_t id,
         const fml::jni::ScopedJavaGlobalRef<jobject>& surface_texture,
-        std::shared_ptr<PlatformViewAndroidJNI> jni_facade)
+        const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade)
     : SurfaceTextureExternalTexture(id, surface_texture, jni_facade),
       impeller_context_(context) {}
 
 SurfaceTextureExternalTextureImpellerGL::
-    ~SurfaceTextureExternalTextureImpellerGL() {
-  Detach();
-}
+    ~SurfaceTextureExternalTextureImpellerGL() {}
 
 void SurfaceTextureExternalTextureImpellerGL::ProcessFrame(
     PaintContext& context,

diff --git a/shell/platform/android/surface_texture_external_texture_gl.h b/shell/platform/android/surface_texture_external_texture_gl.h
@@ -23,7 +23,7 @@ class SurfaceTextureExternalTextureGL : public SurfaceTextureExternalTexture {
   SurfaceTextureExternalTextureGL(
       int64_t id,
       const fml::jni::ScopedJavaGlobalRef<jobject>& surface_texture,
-      std::shared_ptr<PlatformViewAndroidJNI> jni_facade);
+      const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade);
 
   ~SurfaceTextureExternalTextureGL() override;
 
@@ -44,7 +44,7 @@ class SurfaceTextureExternalTextureImpellerGL
       const std::shared_ptr<impeller::ContextGLES>& context,
       int64_t id,
       const fml::jni::ScopedJavaGlobalRef<jobject>& surface_texture,
-      std::shared_ptr<PlatformViewAndroidJNI> jni_facade);
+      const std::shared_ptr<PlatformViewAndroidJNI>& jni_facade);
 
   ~SurfaceTextureExternalTextureImpellerGL() override;