| 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_) {
|
|
|