[Tablet TabStrip] Handle NPE when updating strip scrim in CC layer

(cherry picked from commit d8183c8) Bug: 1312928 Change-Id: I83a22e8755108e6a89aa0236f3fa4266480b49eb Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3594881 Reviewed-by: Theresa Sullivan <twellington@chromium.org> Commit-Queue: Sirisha Kavuluru <skavuluru@google.com> Reviewed-by: Neil Coronado <nemco@google.com> Cr-Original-Commit-Position: refs/heads/main@{#994245} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3599937 Auto-Submit: Sirisha Kavuluru <skavuluru@google.com> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Theresa Sullivan <twellington@chromium.org> Cr-Commit-Position: refs/branch-heads/5005@{#85} Cr-Branched-From: 5b4d945-refs/heads/main@{#992738}
chromium · Apr 21, 2022 · 76100c4 · 76100c4
1 parent 9774f15
commit 76100c4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/...a/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java b/...a/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
@@ -197,7 +197,7 @@ private void updateScrimVisibility(boolean visibility) {
 
             if (!isGridTabSwitcherNonPolishEnabled()) return;
 
-            if (mScrimFadeAnimation != null) {
+            if (mScrimFadeAnimation != null && mScrimFadeAnimation.isRunning()) {
                 mScrimFadeAnimation.cancel();
             }
 
@@ -285,6 +285,9 @@ public StripScrim getStripScrim() {
      * Cleans up internal state.
      */
     public void destroy() {
+        if (mScrimFadeAnimation != null) {
+            mScrimFadeAnimation.cancel();
+        }
         mTabStripTreeProvider.destroy();
         mTabStripTreeProvider = null;
         mIncognitoHelper.destroy();

diff --git a/...droid/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java b/...droid/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java
@@ -86,9 +86,11 @@ public void pushAndUpdateStrip(StripLayoutHelperManager layoutHelper,
 
     /**
      * Updates tab strip scrim.
-     * @param scrim
+     * @param scrim - Scrim applied to tab strip.
      */
     public void updateStripScrim(StripScrim scrim) {
+        if (mNativePtr == 0) return;
+
         TabStripSceneLayerJni.get().updateStripScrim(mNativePtr, TabStripSceneLayer.this,
                 scrim.getX(), scrim.getY(), scrim.getWidth() * mDpToPx, scrim.getHeight() * mDpToPx,
                 scrim.getColor(), scrim.getAlpha());