BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 2 insertions, 20 deletions

diff --git a/chromium/ui/gl/android/android_surface_control_compat.cc b/chromium/ui/gl/android/android_surface_control_compat.cc
index 70a2f706f41..26aebb5dc8f 100644
--- a/chromium/ui/gl/android/android_surface_control_compat.cc
+++ b/chromium/ui/gl/android/android_surface_control_compat.cc
@@ -11,6 +11,7 @@
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
 #include "base/debug/crash_logging.h"
+#include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/no_destructor.h"
 #include "base/strings/string_number_conversions.h"
@@ -49,9 +50,6 @@ using pASurfaceTransaction_delete = void (*)(ASurfaceTransaction*);
 using pASurfaceTransaction_apply = int64_t (*)(ASurfaceTransaction*);
 using pASurfaceTransaction_setOnComplete =
     void (*)(ASurfaceTransaction*, void* ctx, ASurfaceTransaction_OnComplete);
-using pASurfaceTransaction_reparent = void (*)(ASurfaceTransaction*,
-                                               ASurfaceControl* surface_control,
-                                               ASurfaceControl* new_parent);
 using pASurfaceTransaction_setVisibility = void (*)(ASurfaceTransaction*,
                                                     ASurfaceControl*,
                                                     int8_t visibility);
@@ -146,7 +144,6 @@ struct SurfaceControlMethods {
     LOAD_FUNCTION(main_dl_handle, ASurfaceTransaction_delete);
     LOAD_FUNCTION(main_dl_handle, ASurfaceTransaction_apply);
     LOAD_FUNCTION(main_dl_handle, ASurfaceTransaction_setOnComplete);
-    LOAD_FUNCTION(main_dl_handle, ASurfaceTransaction_reparent);
     LOAD_FUNCTION(main_dl_handle, ASurfaceTransaction_setVisibility);
     LOAD_FUNCTION(main_dl_handle, ASurfaceTransaction_setZOrder);
     LOAD_FUNCTION(main_dl_handle, ASurfaceTransaction_setBuffer);
@@ -178,7 +175,6 @@ struct SurfaceControlMethods {
   pASurfaceTransaction_delete ASurfaceTransaction_deleteFn;
   pASurfaceTransaction_apply ASurfaceTransaction_applyFn;
   pASurfaceTransaction_setOnComplete ASurfaceTransaction_setOnCompleteFn;
-  pASurfaceTransaction_reparent ASurfaceTransaction_reparentFn;
   pASurfaceTransaction_setVisibility ASurfaceTransaction_setVisibilityFn;
   pASurfaceTransaction_setZOrder ASurfaceTransaction_setZOrderFn;
   pASurfaceTransaction_setBuffer ASurfaceTransaction_setBufferFn;
@@ -354,14 +350,8 @@ SurfaceControl::Surface::Surface(ANativeWindow* parent, const char* name) {
 }
 
 SurfaceControl::Surface::~Surface() {
-  if (surface_) {
-    // It is important to detach the surface from the tree before deleting it.
-    Transaction transaction;
-    transaction.SetParent(*this, nullptr);
-    transaction.Apply();
-
+  if (surface_)
     SurfaceControlMethods::Get().ASurfaceControl_releaseFn(surface_);
-  }
 }
 
 SurfaceControl::SurfaceStats::SurfaceStats() = default;
@@ -491,13 +481,6 @@ void SurfaceControl::Transaction::SetOnCompleteCb(
       transaction_, ack_ctx, &OnTransactionCompletedOnAnyThread);
 }
 
-void SurfaceControl::Transaction::SetParent(const Surface& surface,
-                                            const Surface* new_parent) {
-  SurfaceControlMethods::Get().ASurfaceTransaction_reparentFn(
-      transaction_, surface.surface(),
-      new_parent ? new_parent->surface() : nullptr);
-}
-
 void SurfaceControl::Transaction::Apply() {
   TRACE_EVENT_ASYNC_BEGIN0("gpu,benchmark", "SurfaceControlTransaction", id_);
   SurfaceControlMethods::Get().ASurfaceTransaction_applyFn(transaction_);
diff --git a/chromium/ui/gl/android/android_surface_control_compat.h b/chromium/ui/gl/android/android_surface_control_compat.h
index c5baeb7807d..2ee53e69f28 100644
--- a/chromium/ui/gl/android/android_surface_control_compat.h
+++ b/chromium/ui/gl/android/android_surface_control_compat.h
@@ -130,7 +130,6 @@ class GL_EXPORT SurfaceControl {
     void SetOnCompleteCb(
         OnCompleteCb cb,
         scoped_refptr<base::SingleThreadTaskRunner> task_runner);
-    void SetParent(const Surface& surface, const Surface* new_parent);
 
     void Apply();