Index: android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java |
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java |
index 29906b5224a934687a1f3cc58692adfd01a22ab8..c0f6387693aafafc62d5b9525364c00907348d8b 100644 |
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java |
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java |
@@ -328,4 +328,28 @@ public class AwTestBase |
} |
}); |
} |
+ |
+ /** |
+ * Returns pure page scale. |
+ */ |
+ protected float getScaleOnUiThread(final AwContents awContents) throws Exception { |
+ return runTestOnUiThreadAndGetResult(new Callable<Float>() { |
+ @Override |
+ public Float call() throws Exception { |
+ return awContents.getContentViewCore().getScale(); |
+ } |
+ }); |
+ } |
+ |
+ /** |
+ * Returns page scale multiplied by the screen density. |
+ */ |
+ protected float getPixelScaleOnUiThread(final AwContents awContents) throws Throwable { |
+ return runTestOnUiThreadAndGetResult(new Callable<Float>() { |
+ @Override |
+ public Float call() throws Exception { |
+ return awContents.getScale(); |
+ } |
+ }); |
+ } |
} |