Rename getDIPScale() to getDipScale()

android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.android_webview.test;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.view.View;
@@ skipping 304 matching lines @@
 
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testUiScrollReflectedInJs() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final ScrollTestContainerView testContainerView =
                 (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
         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);
         final int targetScrollYPix = (int) Math.ceil(targetScrollYCss * deviceDIPScale);
         final JavascriptEventObserver onscrollObserver = new JavascriptEventObserver();
 
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 onscrollObserver.register(testContainerView.getContentViewCore(),
@@ skipping 13 matching lines @@
     @SmallTest
     @Feature({"AndroidWebView"})
     @SuppressLint("DefaultLocale")
     public void testJsScrollReflectedInUi() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final ScrollTestContainerView testContainerView =
                 (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
         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);
         final int targetScrollYPix = (int) Math.floor(targetScrollYCss * deviceDIPScale);
 
         loadDataSync(testContainerView.getAwContents(), contentsClient.getOnPageFinishedHelper(),
                 makeTestPage(null, null, ""), "text/html", false);
 
         final CallbackHelper onScrollToCallbackHelper =
                 testContainerView.getOnScrollToCallbackHelper();
         final int scrollToCallCount = onScrollToCallbackHelper.getCallCount();
         executeJavaScriptAndWaitForResult(testContainerView.getAwContents(), contentsClient,
                 String.format("window.scrollTo(%d, %d);", targetScrollXCss, targetScrollYCss));
         onScrollToCallbackHelper.waitForCallback(scrollToCallCount);
 
         assertScrollOnMainSync(testContainerView, targetScrollXPix, targetScrollYPix);
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testJsScrollFromBody() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final ScrollTestContainerView testContainerView =
                 (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
         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);
         final int targetScrollYPix = (int) Math.floor(targetScrollYCss * deviceDIPScale);
 
         final String scrollFromBodyScript =
                 "<script> "
                 + "  window.scrollTo(" + targetScrollXCss + ", " + targetScrollYCss + "); "
                 + "</script> ";
 
         final CallbackHelper onScrollToCallbackHelper =
                 testContainerView.getOnScrollToCallbackHelper();
         final int scrollToCallCount = onScrollToCallbackHelper.getCallCount();
         loadDataAsync(testContainerView.getAwContents(),
                 makeTestPage(null, null, scrollFromBodyScript), "text/html", false);
         onScrollToCallbackHelper.waitForCallback(scrollToCallCount);
 
         assertScrollOnMainSync(testContainerView, targetScrollXPix, targetScrollYPix);
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testJsScrollCanBeAlteredByUi() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final ScrollTestContainerView testContainerView =
                 (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
         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);
         final int targetScrollYPix = (int) Math.floor(targetScrollYCss * deviceDIPScale);
 
         final int maxScrollXCss = 101;
         final int maxScrollYCss = 201;
         final int maxScrollXPix = (int) Math.floor(maxScrollXCss * deviceDIPScale);
         final int maxScrollYPix = (int) Math.floor(maxScrollYCss * deviceDIPScale);
 
@@ skipping 23 matching lines @@
         enableJavaScriptOnUiThread(testContainerView.getAwContents());
 
         final int dragSteps = 10;
         final int dragStepSize = 24;
         // Watch out when modifying - if the y or x delta aren't big enough vertical or horizontal
         // scroll snapping will kick in.
         final int targetScrollXPix = dragStepSize * dragSteps;
         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.
         assert (maxScrollXPix % dragStepSize) != 0;
         assert (maxScrollYPix % dragStepSize) != 0;
         final int maxScrollXCss = (int) Math.floor(maxScrollXPix / deviceDIPScale);
         final int maxScrollYCss = (int) Math.floor(maxScrollYPix / deviceDIPScale);
 
         setMaxScrollOnMainSync(testContainerView, maxScrollXPix, maxScrollYPix);
 
@@ skipping 204 matching lines @@
 
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testPageUp() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final ScrollTestContainerView testContainerView =
                 (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
         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);
 
         loadTestPageAndWaitForFirstFrame(testContainerView, contentsClient, null, "");
 
         assertScrollOnMainSync(testContainerView, 0, 0);
 
         scrollToOnMainSync(testContainerView, 0, targetScrollYPix);
 
         final CallbackHelper onScrollToCallbackHelper =
@@ skipping 177 matching lines @@
         });
 
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 assertEquals(testContainerView.getScrollY(), scrolledYPix);
             }
         });
     }
 }