| commit | e3a01395aec4d6ad07ddf22031eb6acb58e468bc | [log] [tgz] |
|---|---|---|
| author | Guang Zhu <guangzhu@google.com> | Tue Feb 14 10:02:44 2012 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Feb 14 10:02:44 2012 -0800 |
| tree | 6c68599e51ffc4f58b260cf25c3bb8eafd43d7fc | |
| parent | 3fb7ba1ed2fec08066b1a66bdcbbf816c0e612c9 [diff] | |
| parent | 20a14ca9370ac8f26eaa47122994b1ed6d563e99 [diff] |
Merge "disable cpu_upload path workaround"
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java index 895963a..83c9c3d 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
@@ -903,9 +903,6 @@ settings.setWorkersEnabled(false); settings.setXSSAuditorEnabled(false); settings.setPageCacheCapacity(0); - // this enables cpu upload path (as opposed to gpu upload path) - // and it's only meant to be a temporary workaround! - settings.setProperty("enable_cpu_upload_path", "true"); settings.setProperty("use_minimal_memory", "false"); }