diff options
| author | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-09 05:39:51 +0000 |
|---|---|---|
| committer | michaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-09 05:39:51 +0000 |
| commit | 9a50bf91c7243a36312163b225512df8e7f96d44 (patch) | |
| tree | 5b2c10cb2d16f59819c57083572d0dbf176d1439 /android_webview/browser/browser_view_renderer_impl.cc | |
| parent | 38d28206783f7a509839b29bb9b315b5c92676b8 (diff) | |
| download | chromium_src-9a50bf91c7243a36312163b225512df8e7f96d44.zip chromium_src-9a50bf91c7243a36312163b225512df8e7f96d44.tar.gz chromium_src-9a50bf91c7243a36312163b225512df8e7f96d44.tar.bz2 | |
Made the following changes to enable merge mode
- only set EnableWebViewSynchronousAPIs in unmerge mode
- Allow wait in UI thread
- Disable 8 unit tests since SW renderer didn't work.
BUG=235702, 239144, 238735
Review URL: https://chromiumcodereview.appspot.com/13907007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199128 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/browser/browser_view_renderer_impl.cc')
| -rw-r--r-- | android_webview/browser/browser_view_renderer_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/android_webview/browser/browser_view_renderer_impl.cc b/android_webview/browser/browser_view_renderer_impl.cc index 43e2092..cc3f5c5 100644 --- a/android_webview/browser/browser_view_renderer_impl.cc +++ b/android_webview/browser/browser_view_renderer_impl.cc @@ -122,11 +122,11 @@ BrowserViewRendererImpl* BrowserViewRendererImpl::Create( BrowserViewRenderer::Client* client, JavaHelper* java_helper) { if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kMergeUIAndRendererCompositorThreads)) { - return new InProcessViewRenderer(client, java_helper); + switches::kNoMergeUIAndRendererCompositorThreads)) { + return new BrowserViewRendererImpl(client, java_helper); } - return new BrowserViewRendererImpl(client, java_helper); + return new InProcessViewRenderer(client, java_helper); } // static |