summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--content/browser/renderer_host/render_widget_host_view_android.cc11
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