| Index: content/browser/renderer_host/render_widget_host_view_android.cc
|
| 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 881bf814988c69dda98a2539a3802693b28d6461..d74a7782ded106fd67288f64357e96445b7085cb 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
|
|
|