| Index: android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
|
| diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
|
| index 9e83171e7a940163d6f477990268c43c025dee39..dc513fcc15017d9fd3d3c076902ff52409260769 100644
|
| --- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
|
| +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
|
| @@ -322,7 +322,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
|
| enableJavaScriptOnUiThread(testContainerView.getAwContents());
|
|
|
| final double deviceDIPScale =
|
| - DisplayAndroid.getNonMultiDisplay(testContainerView.getContext()).getDIPScale();
|
| + DisplayAndroid.getNonMultiDisplay(testContainerView.getContext()).getDipScale();
|
| final int targetScrollXCss = 233;
|
| final int targetScrollYCss = 322;
|
| final int targetScrollXPix = (int) Math.ceil(targetScrollXCss * deviceDIPScale);
|
| @@ -356,7 +356,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
|
| enableJavaScriptOnUiThread(testContainerView.getAwContents());
|
|
|
| final double deviceDIPScale =
|
| - DisplayAndroid.getNonMultiDisplay(testContainerView.getContext()).getDIPScale();
|
| + DisplayAndroid.getNonMultiDisplay(testContainerView.getContext()).getDipScale();
|
| final int targetScrollXCss = 132;
|
| final int targetScrollYCss = 243;
|
| final int targetScrollXPix = (int) Math.floor(targetScrollXCss * deviceDIPScale);
|
| @@ -384,7 +384,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
|
| enableJavaScriptOnUiThread(testContainerView.getAwContents());
|
|
|
| final double deviceDIPScale =
|
| - DisplayAndroid.getNonMultiDisplay(testContainerView.getContext()).getDIPScale();
|
| + DisplayAndroid.getNonMultiDisplay(testContainerView.getContext()).getDipScale();
|
| final int targetScrollXCss = 132;
|
| final int targetScrollYCss = 243;
|
| final int targetScrollXPix = (int) Math.floor(targetScrollXCss * deviceDIPScale);
|
| @@ -414,7 +414,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
|
| enableJavaScriptOnUiThread(testContainerView.getAwContents());
|
|
|
| final double deviceDIPScale =
|
| - DisplayAndroid.getNonMultiDisplay(testContainerView.getContext()).getDIPScale();
|
| + DisplayAndroid.getNonMultiDisplay(testContainerView.getContext()).getDipScale();
|
| final int targetScrollXCss = 132;
|
| final int targetScrollYCss = 243;
|
| final int targetScrollXPix = (int) Math.floor(targetScrollXCss * deviceDIPScale);
|
| @@ -458,7 +458,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
|
| final int targetScrollYPix = dragStepSize * dragSteps;
|
|
|
| final double deviceDIPScale =
|
| - DisplayAndroid.getNonMultiDisplay(testContainerView.getContext()).getDIPScale();
|
| + DisplayAndroid.getNonMultiDisplay(testContainerView.getContext()).getDipScale();
|
| final int maxScrollXPix = 101;
|
| final int maxScrollYPix = 211;
|
| // Make sure we can't hit these values simply as a result of scrolling.
|
| @@ -683,7 +683,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
|
| enableJavaScriptOnUiThread(testContainerView.getAwContents());
|
|
|
| final double deviceDIPScale =
|
| - DisplayAndroid.getNonMultiDisplay(testContainerView.getContext()).getDIPScale();
|
| + DisplayAndroid.getNonMultiDisplay(testContainerView.getContext()).getDipScale();
|
| final int targetScrollYCss = 243;
|
| final int targetScrollYPix = (int) Math.ceil(targetScrollYCss * deviceDIPScale);
|
|
|
|
|