android_webview/javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java - Issue 2455653002: Make clear that WindowAndroid::getDisplay must be used when supporting multi-display.

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java

Issue 2455653002: Make clear that WindowAndroid::getDisplay must be used when supporting multi-display. (Closed)

Patch Set: Revert change that snuck in from other branch Created 4 years, 2 months 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

« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/AwContentsAnchorViewTest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java

index 39b672a9253f38f8a2d065a3c25c58b502342121..53ad82eb76186828973e8c995a4698eae21a079a 100644

--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java

+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java

@@ -41,7 +41,8 @@ public class AwLegacyQuirksTest extends AwTestBase {

settings.setJavaScriptEnabled(true);

- DisplayAndroid displayAndroid = DisplayAndroid.get(getInstrumentation().getTargetContext());

+ DisplayAndroid displayAndroid = DisplayAndroid.getNonMultiDisplay(

+ getInstrumentation().getTargetContext());

loadDataSync(awContents, onPageFinishedHelper, pageDeviceDpi, "text/html", false);

int actualWidth = Integer.parseInt(getTitleOnUiThread(awContents));

assertEquals(displayAndroid.getDisplayWidth(), actualWidth, 10f);

@@ -75,7 +76,8 @@ public class AwLegacyQuirksTest extends AwTestBase {

settings.setJavaScriptEnabled(true);

settings.setUseWideViewPort(true);

- DisplayAndroid displayAndroid = DisplayAndroid.get(getInstrumentation().getTargetContext());

+ DisplayAndroid displayAndroid = DisplayAndroid.getNonMultiDisplay(

+ getInstrumentation().getTargetContext());

loadDataSync(awContents, onPageFinishedHelper, page, "text/html", false);

float displayWidth =

displayAndroid.getDisplayWidth() / displayAndroid.getDIPScale();

@@ -101,7 +103,8 @@ public class AwLegacyQuirksTest extends AwTestBase {

settings.setJavaScriptEnabled(true);

- DisplayAndroid displayAndroid = DisplayAndroid.get(getInstrumentation().getTargetContext());

+ DisplayAndroid displayAndroid = DisplayAndroid.getNonMultiDisplay(

+ getInstrumentation().getTargetContext());

loadDataSync(awContents, onPageFinishedHelper, page, "text/html", false);

float displayWidth =

displayAndroid.getDisplayWidth() / displayAndroid.getDIPScale();

@@ -131,8 +134,9 @@ public class AwLegacyQuirksTest extends AwTestBase {

loadUrlSync(awContents, onPageFinishedHelper, "about:blank");

- DisplayAndroid displayAndroid = DisplayAndroid.get(getInstrumentation().getTargetContext());

- float dipScale = (float) displayAndroid.getDIPScale();

+ DisplayAndroid displayAndroid = DisplayAndroid.getNonMultiDisplay(

+ getInstrumentation().getTargetContext());

+ float dipScale = displayAndroid.getDIPScale();

float physicalDisplayWidth = displayAndroid.getPhysicalDisplayWidth() != 0

? displayAndroid.getPhysicalDisplayWidth()

: displayAndroid.getDisplayWidth();