summaryrefslogtreecommitdiffstats
path: root/android_webview/test
diff options
context:
space:
mode:
authorboliu <boliu@chromium.org>2014-10-03 12:14:12 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-03 19:14:29 +0000
commit1738e9d54e29a6f2690e8df15cff0135de415df9 (patch)
tree2e39fbf7b01bed3cf894551c7ed4bdad8a37debb /android_webview/test
parent71cc81322829bf6f4b58dbabedf6f68a20459412 (diff)
downloadchromium_src-1738e9d54e29a6f2690e8df15cff0135de415df9.zip
chromium_src-1738e9d54e29a6f2690e8df15cff0135de415df9.tar.gz
chromium_src-1738e9d54e29a6f2690e8df15cff0135de415df9.tar.bz2
aw: Add DisableHardwareAccelerationForTest annotation
Add an annotation to make an Android WebView instrumentation test run in software mode. Also more preparation for running tests in hardware by making the test activity hardware accelerated. But still default the tests to software. BUG=416981 Review URL: https://codereview.chromium.org/625703002 Cr-Commit-Position: refs/heads/master@{#298072}
Diffstat (limited to 'android_webview/test')
-rw-r--r--android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java b/android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java
index 34094ef..c0d8cb3 100644
--- a/android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java
+++ b/android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java
@@ -227,9 +227,9 @@ public class AwTestContainerView extends FrameLayout {
return new HardwareView(context);
}
- public AwTestContainerView(Context context, boolean hardwareAccelerated) {
+ public AwTestContainerView(Context context, boolean allowHardwareAcceleration) {
super(context);
- if (hardwareAccelerated) {
+ if (allowHardwareAcceleration) {
mHardwareView = createHardwareViewOnlyOnce(context);
}
if (mHardwareView != null) {