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

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

Issue 212863004: Revert of content: Avoid duplicating the logic used to determine GPU features. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | « content/browser/renderer_host/render_view_host_impl.cc ('k') | content/renderer/render_thread_impl.cc » ('j') | 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 d215f5d07ed69696f0def203e7e7dfea696b2464..f661e646292e444893aa6149fd4784302600ec81 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -153,7 +153,9 @@
widget_host->GetRoutingID()) != NULL),
frame_evictor_(new DelegatedFrameEvictor(this)),
using_delegated_renderer_(CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableDelegatedRenderer)),
+ switches::kEnableDelegatedRenderer) &&
+ !CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableDelegatedRenderer)),
locks_on_frame_count_(0),
root_window_destroyed_(false) {
if (!using_delegated_renderer_) {
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.cc ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698