diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 16:08:57 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 16:08:57 +0000 |
| commit | e746403e1f47720feb3bd7d268ef3df0a2b74a14 (patch) | |
| tree | 0e519b55c7a39153217c68770d213914b485efa1 | |
| parent | e3b10d1ee147e27bac357b41ce7cf3b751e4a33e (diff) | |
| download | chromium_src-e746403e1f47720feb3bd7d268ef3df0a2b74a14.zip chromium_src-e746403e1f47720feb3bd7d268ef3df0a2b74a14.tar.gz chromium_src-e746403e1f47720feb3bd7d268ef3df0a2b74a14.tar.bz2 | |
[Android WebView] Fix AwSettingsTest.testUseWideViewportControlsDoubleTabToZoom
The test wasn't working properly on tablets in landscape mode because double
tap was effectively zooming in instead of zooming out. To fix that, the page
layout has been updated take display width into account.
BUG=357235
R=mkosiba@chromium.org
Review URL: https://codereview.chromium.org/216873002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260146 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java | 12 |
1 files changed, 11 insertions, 1 deletions
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 853a3dd..8aeb3c5 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 @@ -2439,8 +2439,18 @@ public class AwSettingsTest extends AwTestBase { AwSettings settings = getAwSettingsOnUiThread(awContents); settings.setBuiltInZoomControls(true); - final String page = "<html><body>Page Text</body></html>"; + DeviceDisplayInfo deviceInfo = + DeviceDisplayInfo.create(testContainerView.getContext()); + int displayWidth = (int) (deviceInfo.getDisplayWidth() / deviceInfo.getDIPScale()); + int layoutWidth = displayWidth * 2; + final String page = "<html>" + + "<head><meta name='viewport' content='width=" + layoutWidth + "'>" + + "<style> body { width: " + layoutWidth + "px; }</style></head>" + + "<body>Page Text</body></html>"; + assertFalse(settings.getUseWideViewPort()); + // Without wide viewport the <meta viewport> tag will be ignored by WebView, + // but it doesn't really matter as we don't expect double tap to change the scale. loadDataSync(awContents, onPageFinishedHelper, page, "text/html", false); final float initialScale = getScaleOnUiThread(awContents); simulateDoubleTapCenterOfWebViewOnUiThread(testContainerView); |