| 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 c328392e6cb5ac8e90ce102891ef63cb4e24a93e..2e2c5004e69755d2850d7f2f235434ec3313f11d 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
|
| @@ -332,8 +332,7 @@ public class AwTestBase
|
| final AwContentsClient awContentsClient, boolean supportsLegacyQuirks) {
|
| final TestDependencyFactory testDependencyFactory = createTestDependencyFactory();
|
|
|
| - boolean allowHardwareAcceleration = !testMethodHasAnnotation(
|
| - DisableHardwareAccelerationForTest.class);
|
| + boolean allowHardwareAcceleration = isHardwareAcceleratedTest();
|
| final AwTestContainerView testContainerView =
|
| testDependencyFactory.createAwTestContainerView(getActivity(),
|
| allowHardwareAcceleration);
|
| @@ -348,6 +347,10 @@ public class AwTestBase
|
| return testContainerView;
|
| }
|
|
|
| + protected boolean isHardwareAcceleratedTest() {
|
| + return !testMethodHasAnnotation(DisableHardwareAccelerationForTest.class);
|
| + }
|
| +
|
| public AwTestContainerView createAwTestContainerViewOnMainSync(
|
| final AwContentsClient client) throws Exception {
|
| return createAwTestContainerViewOnMainSync(client, false);
|
|
|