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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.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

Download patch

« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/firstrun/ProfileDataCache.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/AwSettingsTest.java

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

index 67d7836cd666af972b8e591589fe17d4c0d21bbb..5f9aa70cb36160173e9c5f95d1b07147e8a9a5fa 100644

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

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

@@ -959,7 +959,7 @@ public class AwSettingsTest extends AwTestBase {

}

protected String getData() {

- DisplayAndroid displayAndroid = DisplayAndroid.get(mContext);

+ DisplayAndroid displayAndroid = DisplayAndroid.getNonMultiDisplay(mContext);

int displayWidth =

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

int layoutWidth = (int) (displayWidth * 2.5f); // Use 2.5 as autosizing layout tests do.

@@ -1466,7 +1466,7 @@ public class AwSettingsTest extends AwTestBase {

loadDataSync(getData());

final int reportedClientWidth = Integer.parseInt(getTitleOnUiThread());

if (value) {

- final DisplayAndroid displayAndroid = DisplayAndroid.get(mContext);

+ final DisplayAndroid displayAndroid = DisplayAndroid.getNonMultiDisplay(mContext);

// The clientWidth is subject to pixel snapping.

final int displayWidth = (int) Math.ceil(

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

@@ -2538,7 +2538,8 @@ public class AwSettingsTest extends AwTestBase {

pageTemplate,

"<meta name='viewport' content='width=" + viewportTagSpecifiedWidth + "' />");

- DisplayAndroid displayAndroid = DisplayAndroid.get(testContainer.getContext());

+ DisplayAndroid displayAndroid = DisplayAndroid.getNonMultiDisplay(

+ testContainer.getContext());

int displayWidth = (int) (displayAndroid.getDisplayWidth() / displayAndroid.getDIPScale());

settings.setJavaScriptEnabled(true);

@@ -2607,7 +2608,7 @@ public class AwSettingsTest extends AwTestBase {

settings.setBuiltInZoomControls(true);

DisplayAndroid displayAndroid =

- DisplayAndroid.get(testContainerView.getContext());

+ DisplayAndroid.getNonMultiDisplay(testContainerView.getContext());

int displayWidth = (int) (displayAndroid.getDisplayWidth() / displayAndroid.getDIPScale());

int layoutWidth = displayWidth * 2;

final String page = "<html>"