Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1698)

Unified Diff: content/browser/renderer_host/render_widget_host_view_android.cc

Issue 110913010: [Android] Fixes app crash when using both enable and disable delegated renderer command line switch. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Patch for landing! Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698