-
Notifications
You must be signed in to change notification settings - Fork 920
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Patch Chromium files to fix PIP behavior #27849
Draft
simoarpe
wants to merge
1
commit into
master
Choose a base branch
from
simone/fix-pip-behavior
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+40
−0
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
28 changes: 28 additions & 0 deletions
28
...d-java-src-org-chromium-chrome-browser-fullscreen-FullscreenHtmlApiHandlerBase.java.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 65490bf6514e2ab2e8aa28b9c28d6310b82d1341..42fc2883b01ba6871d96c603a29b9b91466fa9c3 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); | ||
12 changes: 12 additions & 0 deletions
12
...rc-org-chromium-chrome-browser-media-FullscreenVideoPictureInPictureController.java.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 2c3e387f09b7b4cb47de76fb479c2bdc696a7107..fad6ca49cb62231b9879e8af5dff3f3ef8916ca5 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; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And one more quiestion, shouldn't it be apllied only for
onHiddencase? It feels like in other cases of callingexitPersistentFullscreenModewe shouldn't care ofmTabHiddenByChangedTabs.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
exitPersistentFullscreenModemethod is called also byonActivityStateChange, so acting only ononHiddencase would not prevent the activity from being reset into normal mode.