From 8e9b3859afaaf8d645f431290294f0faccb70af5 Mon Sep 17 00:00:00 2001
From: Chinmay Garde <chinmaygarde@google.com>
Date: Mon, 22 Jul 2024 14:15:10 -0700
Subject: [PATCH] Cleanly revert requiring backpressure for AHB swapchains.

Revert 0c417292c6bdac750ffede38998426fd6e825554
---
 impeller/toolkit/android/proc_table.h           | 1 -
 impeller/toolkit/android/surface_control.cc     | 4 +---
 impeller/toolkit/android/surface_transaction.cc | 5 +----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/impeller/toolkit/android/proc_table.h b/impeller/toolkit/android/proc_table.h
index 3f34cfd65999a..9e639603b9c1b 100644
--- a/impeller/toolkit/android/proc_table.h
+++ b/impeller/toolkit/android/proc_table.h
@@ -60,7 +60,6 @@ namespace impeller::android {
   INVOKE(ASurfaceTransaction_setBuffer, 29)                      \
   INVOKE(ASurfaceTransaction_setColor, 29)                       \
   INVOKE(ASurfaceTransaction_setOnComplete, 29)                  \
-  INVOKE(ASurfaceTransaction_setEnableBackPressure, 31)          \
   INVOKE(ASurfaceTransactionStats_getPreviousReleaseFenceFd, 29) \
   INVOKE(ATrace_isEnabled, 23)                                   \
   INVOKE(eglGetNativeClientBufferANDROID, 0)
diff --git a/impeller/toolkit/android/surface_control.cc b/impeller/toolkit/android/surface_control.cc
index da6a48b572791..71282e7ccc981 100644
--- a/impeller/toolkit/android/surface_control.cc
+++ b/impeller/toolkit/android/surface_control.cc
@@ -5,7 +5,6 @@
 #include "impeller/toolkit/android/surface_control.h"
 
 #include "impeller/base/validation.h"
-#include "impeller/toolkit/android/proc_table.h"
 #include "impeller/toolkit/android/surface_transaction.h"
 
 namespace impeller::android {
@@ -50,8 +49,7 @@ bool SurfaceControl::RemoveFromParent() const {
 
 bool SurfaceControl::IsAvailableOnPlatform() {
   return GetProcTable().IsValid() &&
-         GetProcTable().ASurfaceControl_createFromWindow.IsAvailable() &&
-         GetProcTable().ASurfaceTransaction_setEnableBackPressure.IsAvailable();
+         GetProcTable().ASurfaceControl_createFromWindow.IsAvailable();
 }
 
 }  // namespace impeller::android
diff --git a/impeller/toolkit/android/surface_transaction.cc b/impeller/toolkit/android/surface_transaction.cc
index 048bcd5b36be5..557dedb3cb261 100644
--- a/impeller/toolkit/android/surface_transaction.cc
+++ b/impeller/toolkit/android/surface_transaction.cc
@@ -58,10 +58,7 @@ bool SurfaceTransaction::SetContents(const SurfaceControl* control,
     VALIDATION_LOG << "Invalid control or buffer.";
     return false;
   }
-
-  const auto& proc_table = GetProcTable();
-
-  proc_table.ASurfaceTransaction_setBuffer(
+  GetProcTable().ASurfaceTransaction_setBuffer(
       transaction_.get(),                                      //
       control->GetHandle(),                                    //
       buffer->GetHandle(),                                     //