diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-21 23:00:32 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-21 23:00:32 +0000 |
| commit | 99f22a1501b5b365d61b79501cff000114edbb6c (patch) | |
| tree | db75747c797d8ac3bbc12fa8fd08f08c7ca61f8f /android_webview | |
| parent | c36744a268c08f5a268474f5eafddb54aca0466a (diff) | |
| download | chromium_src-99f22a1501b5b365d61b79501cff000114edbb6c.zip chromium_src-99f22a1501b5b365d61b79501cff000114edbb6c.tar.gz chromium_src-99f22a1501b5b365d61b79501cff000114edbb6c.tar.bz2 | |
Revert "Android Webview disable merged threads"
SW rendering is now sufficiently mature that we can enable the merge
thread mode for upstream tests.
This reverts commit 72eaf280d0585202f8d64ab68066b180db6b7335.
NOTRY=true
BUG=230226
Review URL: https://chromiumcodereview.appspot.com/15335003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201381 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/lib/main/aw_main_delegate.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc index acdc3dd..665bdb8 100644 --- a/android_webview/lib/main/aw_main_delegate.cc +++ b/android_webview/lib/main/aw_main_delegate.cc @@ -56,13 +56,6 @@ bool AwMainDelegate::BasicStartupComplete(int* exit_code) { ::EnableVirtualizedContext(); CommandLine* cl = CommandLine::ForCurrentProcess(); - - // Temporarily disable merged thread mode until proper hardware init is done. - // Currently hardware draw with incomplete init is making invalid GL calls - // that is crashing in graphics driver on Nexus 7. - if (!cl->HasSwitch("merge-ui-and-compositor-threads")) - cl->AppendSwitch(switches::kNoMergeUIAndRendererCompositorThreads); - if (UIAndRendererCompositorThreadsNotMerged()) { cl->AppendSwitch(cc::switches::kEnableCompositorFrameMessage); cl->AppendSwitch(switches::kEnableWebViewSynchronousAPIs); |