From 606d85f2a5386472314d39923da28c70c60dc8e7 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 2 Feb 2022 12:21:57 +0100
Subject: BASELINE: Update Chromium to 96.0.4664.181

Change-Id: I762cd1da89d73aa6313b4a753fe126c34833f046
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 .../chromium/weblayer_private/ContentViewRenderView.java   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'chromium/weblayer/browser/java/org/chromium/weblayer_private/ContentViewRenderView.java')

diff --git a/chromium/weblayer/browser/java/org/chromium/weblayer_private/ContentViewRenderView.java b/chromium/weblayer/browser/java/org/chromium/weblayer_private/ContentViewRenderView.java
index c963f6de834..ed95cc3a693 100644
--- a/chromium/weblayer/browser/java/org/chromium/weblayer_private/ContentViewRenderView.java
+++ b/chromium/weblayer/browser/java/org/chromium/weblayer_private/ContentViewRenderView.java
@@ -64,6 +64,9 @@ public class ContentViewRenderView
     // The native side of this object.
     private long mNativeContentViewRenderView;
 
+    private Surface mLastSurface;
+    private boolean mLastCanBeUsedWithSurfaceControl;
+
     private int mMinimumSurfaceWidth;
     private int mMinimumSurfaceHeight;
 
@@ -164,6 +167,13 @@ public class ContentViewRenderView
                 int height, boolean transparentBackground) {
             assert mNativeContentViewRenderView != 0;
             assert mSurfaceData == ContentViewRenderView.this.mCurrent;
+            if (mLastSurface == surface
+                    && mLastCanBeUsedWithSurfaceControl == canBeUsedWithSurfaceControl) {
+                surface = null;
+            } else {
+                mLastSurface = surface;
+                mLastCanBeUsedWithSurfaceControl = canBeUsedWithSurfaceControl;
+            }
             ContentViewRenderViewJni.get().surfaceChanged(mNativeContentViewRenderView,
                     canBeUsedWithSurfaceControl, width, height, transparentBackground, surface);
             mCompositorHasSurface = surface != null;
@@ -178,6 +188,8 @@ public class ContentViewRenderView
             ContentViewRenderViewJni.get().surfaceDestroyed(
                     mNativeContentViewRenderView, cacheBackBuffer);
             mCompositorHasSurface = false;
+            mLastSurface = null;
+            mLastCanBeUsedWithSurfaceControl = false;
         }
 
         @Override
@@ -1023,7 +1035,7 @@ public class ContentViewRenderView
         void surfaceCreated(long nativeContentViewRenderView);
         void surfaceDestroyed(long nativeContentViewRenderView, boolean cacheBackBuffer);
         void surfaceChanged(long nativeContentViewRenderView, boolean canBeUsedWithSurfaceControl,
-                int width, int height, boolean transparentBackground, Surface surface);
+                int width, int height, boolean transparentBackground, Surface newSurface);
         void setNeedsRedraw(long nativeContentViewRenderView);
         void evictCachedSurface(long nativeContentViewRenderView);
         ResourceManager getResourceManager(long nativeContentViewRenderView);
-- 
cgit v1.2.1