Patch Chromium files to fix PIP behavior

brave · Feb 27, 2025 · 9334715 · 9334715
1 parent 8355412
commit 9334715
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 0 deletions.
diff --git a/...d-java-src-org-chromium-chrome-browser-fullscreen-FullscreenHtmlApiHandlerBase.java.patch b/...d-java-src-org-chromium-chrome-browser-fullscreen-FullscreenHtmlApiHandlerBase.java.patch
@@ -0,0 +1,28 @@
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandlerBase.java b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandlerBase.java
+index 65490bf6514e2..42fc2883b01ba 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandlerBase.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandlerBase.java
+@@ -113,6 +113,7 @@ public abstract class FullscreenHtmlApiHandlerBase
+     @Nullable private Tab mTab;
+
+     private boolean mNotifyOnNextExit;
++    private boolean mTabHiddenByChangedTabs;
+
+     // Current ContentView. Updates when active tab is switched or WebContents is swapped
+     // in the current Tab.
+@@ -275,6 +276,7 @@ public abstract class FullscreenHtmlApiHandlerBase
+
+                     @Override
+                     public void onHidden(Tab tab, @TabHidingType int reason) {
++                        mTabHiddenByChangedTabs = reason == TabHidingType.CHANGED_TABS;
+                         // Clean up any fullscreen state that might impact other tabs.
+                         exitPersistentFullscreenMode();
+                     }
+@@ -443,6 +445,7 @@ public abstract class FullscreenHtmlApiHandlerBase
+
+     @Override
+     public void exitPersistentFullscreenMode() {
++        if (mActivity.isInPictureInPictureMode() && !mTabHiddenByChangedTabs) return;
+         if (getPersistentFullscreenMode()) {
+             getToast().onExitPersistentFullscreen();
+             mPersistentModeSupplier.set(false);
diff --git a/...rc-org-chromium-chrome-browser-media-FullscreenVideoPictureInPictureController.java.patch b/...rc-org-chromium-chrome-browser-media-FullscreenVideoPictureInPictureController.java.patch
@@ -0,0 +1,12 @@
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/FullscreenVideoPictureInPictureController.java b/chrome/android/java/src/org/chromium/chrome/browser/media/FullscreenVideoPictureInPictureController.java
+index 2c3e387f09b7b..fad6ca49cb622 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/media/FullscreenVideoPictureInPictureController.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/media/FullscreenVideoPictureInPictureController.java
+@@ -560,6 +560,7 @@ public class FullscreenVideoPictureInPictureController {
+         Log.i(TAG, "Dismiss activity with reason " + reason);
+         updateAutoPictureInPictureStatusIfNeeded();
+         mDismissPending = false;
++        if (reason == MetricsEndReason.START || reason == MetricsEndReason.RESUME) return;
+
+         if (!isPipSessionActive()) {
+             return;