Revert "[E2E] Fix initial fullscreen when cover"
This reverts commit 83aa876aeca68299c5984aad428ed920b1a18c41.
Reason for revert: breaks DisplayCutoutTest#testViewportFitCover_NotFullscreen on android-pie-arm64-rel and android-arm64-tests
Original change's description:
> [E2E] Fix initial fullscreen when cover
>
> Display Cutout has been for fullscreen only, but with Edge to Edge
> it also activates when not in fullscreen.
>
> At one point the native and Java code conflicted and an assert
> started firing, possibly due to E2E work. The assert was changed
> to an if, but that blocks fullscreen from working correctly
> (probably only when E2E is enabled). See https://crbug.com/1477596
> for the assert/crash.
>
> Now we check if E2E is enabled and no longer override to
> viewport-fit=auto.
>
> BUG:1502359, 1480477
>
> Change-Id: I5791be8436e8f79895c15e0df291d3493fa9521d
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5080036
> Reviewed-by: Theresa Sullivan <twellington@chromium.org>
> Commit-Queue: Donn Denman <donnd@chromium.org>
> Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
> Auto-Submit: Donn Denman <donnd@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1232206}
Bug: 1502359, 1480477, 1507760
Change-Id: Iddfcd16e3995a6e192b28c460d1cd9a6acf494f4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5079438
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Owners-Override: Ioana Pandele <ioanap@chromium.org>
Commit-Queue: Ioana Pandele <ioanap@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1232609}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/display_cutout/DisplayCutoutTabHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/display_cutout/DisplayCutoutTabHelper.java
index 6030c44..9233255 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/display_cutout/DisplayCutoutTabHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/display_cutout/DisplayCutoutTabHelper.java
@@ -14,7 +14,6 @@
import org.chromium.base.UserDataHost;
import org.chromium.base.supplier.ObservableSupplier;
import org.chromium.chrome.browser.customtabs.BaseCustomTabActivity;
-import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.tab.EmptyTabObserver;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tab.TabObserver;
@@ -116,11 +115,6 @@
return (baseCustomTabActivity.getIntentDataProvider().getTwaDisplayMode()
instanceof TrustedWebActivityDisplayMode.ImmersiveMode);
}
-
- @Override
- public boolean isDrawEdgeToEdgeEnabled() {
- return ChromeFeatureList.sDrawEdgeToEdge.isEnabled();
- }
}
/**
diff --git a/components/browser_ui/display_cutout/android/java/src/org/chromium/components/browser_ui/display_cutout/DisplayCutoutController.java b/components/browser_ui/display_cutout/android/java/src/org/chromium/components/browser_ui/display_cutout/DisplayCutoutController.java
index 258b585..fe273f3 100644
--- a/components/browser_ui/display_cutout/android/java/src/org/chromium/components/browser_ui/display_cutout/DisplayCutoutController.java
+++ b/components/browser_ui/display_cutout/android/java/src/org/chromium/components/browser_ui/display_cutout/DisplayCutoutController.java
@@ -122,9 +122,6 @@
/** Whether the activity is in browser (not-HTML) fullscreen. */
boolean isInBrowserFullscreen();
-
- /** Whether the basic Feature for drawing Edge To Edge is enabled. */
- boolean isDrawEdgeToEdgeEnabled();
}
private final Delegate mDelegate;
@@ -231,9 +228,7 @@
value == ViewportFit.COVER || value == ViewportFit.COVER_FORCED_BY_USER_AGENT);
// TODO(crbug.com/1480477): Investigate whether if() can be turned into assert.
- // Most likely we will need to just remove this section when E2E is launched.
- if (!mDelegate.isDrawEdgeToEdgeEnabled()
- && !mDelegate.getWebContents().isFullscreenForCurrentTab()
+ if (!mDelegate.getWebContents().isFullscreenForCurrentTab()
&& !mDelegate.isInBrowserFullscreen()) {
value = ViewportFit.AUTO;
}
