| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 package org.chromium.android_webview.test; | 5 package org.chromium.android_webview.test; |
| 6 | 6 |
| 7 import android.test.suitebuilder.annotation.MediumTest; | 7 import android.support.test.filters.MediumTest; |
| 8 | 8 |
| 9 import org.chromium.android_webview.AwContents; | 9 import org.chromium.android_webview.AwContents; |
| 10 import org.chromium.android_webview.AwContentsClient; | 10 import org.chromium.android_webview.AwContentsClient; |
| 11 import org.chromium.android_webview.AwSettings; | 11 import org.chromium.android_webview.AwSettings; |
| 12 import org.chromium.base.annotations.SuppressFBWarnings; | 12 import org.chromium.base.annotations.SuppressFBWarnings; |
| 13 import org.chromium.base.test.util.CallbackHelper; | 13 import org.chromium.base.test.util.CallbackHelper; |
| 14 import org.chromium.base.test.util.Feature; | 14 import org.chromium.base.test.util.Feature; |
| 15 import org.chromium.ui.display.DisplayAndroid; | 15 import org.chromium.ui.display.DisplayAndroid; |
| 16 | 16 |
| 17 import java.util.Locale; | 17 import java.util.Locale; |
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 349 private void ensureScaleBecomes(final float targetScale, final AwContents aw
Contents) | 349 private void ensureScaleBecomes(final float targetScale, final AwContents aw
Contents) |
| 350 throws Throwable { | 350 throws Throwable { |
| 351 pollInstrumentationThread(new Callable<Boolean>() { | 351 pollInstrumentationThread(new Callable<Boolean>() { |
| 352 @Override | 352 @Override |
| 353 public Boolean call() throws Exception { | 353 public Boolean call() throws Exception { |
| 354 return targetScale == getScaleOnUiThread(awContents); | 354 return targetScale == getScaleOnUiThread(awContents); |
| 355 } | 355 } |
| 356 }); | 356 }); |
| 357 } | 357 } |
| 358 } | 358 } |
| OLD | NEW |