Index: android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java |
diff --git a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java |
index bac071fe1f295866b0a6b7db013f003921cf1480..581fff2f8b1174a91c794861cad8128b447a8c7a 100644 |
--- a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java |
+++ b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java |
@@ -28,6 +28,10 @@ public class AwShellApplication extends Application { |
AwShellResourceProvider.registerResources(this); |
CommandLine.initFromFile("/data/local/chrome-command-line"); |
+ // TODO(michaelbai) : Remove this once we fully move to UI/compositor thread merge mode. |
+ if (!CommandLine.getInstance().hasSwitch("merge-ui-and-compositor-threads")) { |
+ CommandLine.getInstance().appendSwitch("no-merge-ui-and-compositor-threads"); |
+ } |
joth
2013/04/26 18:06:44
The plan was not to add this here to get upstream
michaelbai
2013/04/26 21:41:43
We want to run downstream in no-merge mode and ups
joth
2013/04/26 21:52:35
(Note this file is not used in downstream)
The dif
|
if (CommandLine.getInstance().hasSwitch(CommandLine.WAIT_FOR_JAVA_DEBUGGER)) { |
Log.e(TAG, "Waiting for Java debugger to connect..."); |