android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java - Issue 2485063004: Rename getDIPScale() to getDipScale()

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 2485063004: Rename getDIPScale() to getDipScale() (Closed)

Patch Set: 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 | « 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 5f9aa70cb36160173e9c5f95d1b07147e8a9a5fa..2b893aed19f7de14ecebce03cf7b95321e5fc806 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

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

protected String getData() {

DisplayAndroid displayAndroid = DisplayAndroid.getNonMultiDisplay(mContext);

int displayWidth =

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

+ (int) (displayAndroid.getDisplayWidth() / displayAndroid.getDipScale());

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

StringBuilder sb = new StringBuilder();

sb.append("<html>"

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

final DisplayAndroid displayAndroid = DisplayAndroid.getNonMultiDisplay(mContext);

// The clientWidth is subject to pixel snapping.

final int displayWidth = (int) Math.ceil(

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

+ displayAndroid.getDisplayWidth() / displayAndroid.getDipScale());

assertEquals(displayWidth, reportedClientWidth);

} else {

assertEquals(3000, reportedClientWidth);

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

DisplayAndroid displayAndroid = DisplayAndroid.getNonMultiDisplay(

testContainer.getContext());

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

+ int displayWidth = (int) (displayAndroid.getDisplayWidth() / displayAndroid.getDipScale());

settings.setJavaScriptEnabled(true);

assertFalse(settings.getUseWideViewPort());

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

DisplayAndroid displayAndroid =

DisplayAndroid.getNonMultiDisplay(testContainerView.getContext());

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

+ int displayWidth = (int) (displayAndroid.getDisplayWidth() / displayAndroid.getDipScale());

int layoutWidth = displayWidth * 2;

final String page = "<html>"

+ "<head><meta name='viewport' content='width=" + layoutWidth + "'>"