diff options
| author | vivek.vg@samsung.com <vivek.vg@samsung.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-07 23:27:16 +0000 |
|---|---|---|
| committer | vivek.vg@samsung.com <vivek.vg@samsung.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-07 23:27:16 +0000 |
| commit | 93ae045c61dc86613b92b6fd910570df9845056f (patch) | |
| tree | 0d01063c9a5d2b9b7d2bb5fc313254a46ec93618 | |
| parent | 4436c9e4f278db827b4e0b392f214ed81f837d79 (diff) | |
| download | chromium_src-93ae045c61dc86613b92b6fd910570df9845056f.zip chromium_src-93ae045c61dc86613b92b6fd910570df9845056f.tar.gz chromium_src-93ae045c61dc86613b92b6fd910570df9845056f.tar.bz2 | |
[Android] Fixes app crash when using both enable and disable delegated renderer command line switch.
The function UsingDelegatedRenderer should also check for command line switch
--disable-delegated-renderer's presence while determining the usage of
delegated renderer.
BUG=330714
Review URL: https://codereview.chromium.org/110913010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243428 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_view_android.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc index 881bf81..d74a778 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.cc +++ b/content/browser/renderer_host/render_widget_host_view_android.cc @@ -99,8 +99,15 @@ void CopyFromCompositingSurfaceFinished( } bool UsingDelegatedRenderer() { - return CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableDelegatedRenderer); + bool using_delegated_renderer = false; + + using_delegated_renderer |= CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableDelegatedRenderer); + + using_delegated_renderer &= !CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableDelegatedRenderer); + + return using_delegated_renderer; } } // anonymous namespace |