chrome/android/javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTest.java - Issue 2484293003: Use only renderer driven offsets for fullscreen state.

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTest.java

Issue 2484293003: Use only renderer driven offsets for fullscreen state. (Closed)

Patch Set: Partially disable testControlsShownOnUnresponsiveRenderer due to timing issues with renderer logic … Created 4 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java_sources.gni ('k') | chrome/android/junit/src/org/chromium/chrome/browser/fullscreen/BrowserStateBrowserControlsVisibilityDelegateTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTest.java

index 27d2c015f514dd508e9f8247b3ab7f68d773f849..7d2c77ddd27e0f75e48181edd71ec9542fa6a194 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTest.java

@@ -27,8 +27,8 @@ import org.chromium.base.test.util.UrlUtils;

import org.chromium.chrome.R;

import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager.FullscreenListener;

import org.chromium.chrome.browser.omnibox.UrlBar;

-import org.chromium.chrome.browser.tab.BrowserControlsVisibilityDelegate;

import org.chromium.chrome.browser.tab.Tab;

+import org.chromium.chrome.browser.tab.TabStateBrowserControlsVisibilityDelegate;

import org.chromium.chrome.browser.tab.TabWebContentsDelegateAndroid;

import org.chromium.chrome.test.ChromeTabbedActivityTestBase;

import org.chromium.chrome.test.util.FullscreenTestUtils;

@@ -91,7 +91,7 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

ThreadUtils.runOnUiThreadBlocking(new Runnable() {

@Override

public void run() {

- BrowserControlsVisibilityDelegate.disablePageLoadDelayForTests();

+ TabStateBrowserControlsVisibilityDelegate.disablePageLoadDelayForTests();

}

});

}

@@ -148,10 +148,10 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

@LargeTest

@Feature({"Fullscreen"})

public void testExitPersistentFullscreenAllowsManualFullscreen() throws InterruptedException {

+ disableBrowserOverrides();

startMainActivityWithURL(LONG_FULLSCREEN_API_HTML_TEST_PAGE);

ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();

- fullscreenManager.setAnimationDurationsForTest(1, 1);

int browserControlsHeight = fullscreenManager.getTopControlsHeight();

Tab tab = getActivity().getActivityTab();

@@ -167,7 +167,6 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

TestTouchUtils.sleepForDoubleTapTimeout(getInstrumentation());

singleClickView(view);

FullscreenTestUtils.waitForPersistentFullscreen(delegate, false);

- waitForNoBrowserBrowserControlsOffset();

waitForBrowserControlsPosition(0);

scrollBrowserControls(false);

@@ -177,10 +176,10 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

@LargeTest

@Feature({"Fullscreen"})

public void testManualHidingShowingBrowserControls() throws InterruptedException {

+ disableBrowserOverrides();

startMainActivityWithURL(LONG_HTML_TEST_PAGE);

final ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();

- disableBrowserOverrides();

assertEquals(fullscreenManager.getTopControlOffset(), 0f);

@@ -195,10 +194,10 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

@Feature({"Fullscreen"})

public void testHidingBrowserControlsRemovesSurfaceFlingerOverlay()

throws InterruptedException {

+ disableBrowserOverrides();

startMainActivityWithURL(LONG_HTML_TEST_PAGE);

final ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();

- disableBrowserOverrides();

assertEquals(fullscreenManager.getTopControlOffset(), 0f);

@@ -245,12 +244,12 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

@LargeTest

@Feature({"Fullscreen"})

public void testManualFullscreenDisabledForChromePages() throws InterruptedException {

+ disableBrowserOverrides();

// The credits page was chosen as it is a chrome:// page that is long and would support

// manual fullscreen if it were supported.

startMainActivityWithURL("chrome://credits");

final ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();

- disableBrowserOverrides();

int browserControlsHeight = fullscreenManager.getTopControlsHeight();

assertEquals(fullscreenManager.getTopControlOffset(), 0f);

@@ -270,11 +269,10 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

@LargeTest

@Feature({"Fullscreen"})

public void testControlsShownOnUnresponsiveRenderer() throws InterruptedException {

+ disableBrowserOverrides();

startMainActivityWithURL(LONG_HTML_TEST_PAGE);

ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();

- fullscreenManager.setAnimationDurationsForTest(1, 1);

- waitForNoBrowserBrowserControlsOffset();

assertEquals(fullscreenManager.getTopControlOffset(), 0f);

scrollBrowserControls(false);

@@ -296,7 +294,9 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

delegate.rendererResponsive();

}

});

- waitForNoBrowserBrowserControlsOffset();

+ // TODO(tedchoc): This is running into timing issues with the renderer offset logic.

+ //waitForBrowserControlsToBeMoveable(getActivity().getActivityTab());

}

@@ -306,8 +306,8 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

@DisabledTest(message = "crbug.com/642336")

public void testPrerenderedPageSupportsManualHiding() throws InterruptedException {

- startMainActivityOnBlankPage();

disableBrowserOverrides();

+ startMainActivityOnBlankPage();

EmbeddedTestServer testServer = EmbeddedTestServer.createAndStartServer(

getInstrumentation().getContext());

@@ -333,13 +333,12 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

@Feature({"Fullscreen"})

public void testBrowserControlsShownWhenInputIsFocused()

throws InterruptedException, TimeoutException {

+ disableBrowserOverrides();

startMainActivityWithURL(LONG_HTML_WITH_AUTO_FOCUS_INPUT_TEST_PAGE);

ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();

assertEquals(fullscreenManager.getTopControlOffset(), 0f);

- fullscreenManager.setAnimationDurationsForTest(1, 1);

int browserControlsHeight = fullscreenManager.getTopControlsHeight();

float dragX = 50f;

float dragStartY = browserControlsHeight * 3;

@@ -348,7 +347,6 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

dragStart(dragX, dragStartY, downTime);

dragTo(dragX, dragX, dragStartY, dragEndY, 100, downTime);

dragEnd(dragX, dragEndY, downTime);

- waitForNoBrowserBrowserControlsOffset();

assertEquals(fullscreenManager.getTopControlOffset(), 0f);

Tab tab = getActivity().getActivityTab();

@@ -395,16 +393,6 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

}));

}

- private void waitForNoBrowserBrowserControlsOffset() throws InterruptedException {

- final ChromeFullscreenManager fullscreenManager = getActivity().getFullscreenManager();

- CriteriaHelper.pollUiThread(new Criteria() {

- @Override

- public boolean isSatisfied() {

- return !fullscreenManager.hasBrowserControlOffsetOverride();

- }

- });

- }

private void waitForPageToBeScrollable(final Tab tab) throws InterruptedException {

CriteriaHelper.pollUiThread(new Criteria() {

@Override

@@ -488,7 +476,7 @@ public class FullscreenManagerTest extends ChromeTabbedActivityTestBase {

ThreadUtils.runOnUiThreadBlocking(new Runnable() {

@Override

public void run() {

- getActivity().getFullscreenManager().disableBrowserOverrideForTest();

+ BrowserStateBrowserControlsVisibilityDelegate.disableForTesting();

}

});

}