Chromium Code Reviews| 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 f661e646292e444893aa6149fd4784302600ec81..e76c3eda16257f9de0f28ba7e194abc40e257ff1 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_android.cc |
| +++ b/content/browser/renderer_host/render_widget_host_view_android.cc |
| @@ -32,6 +32,7 @@ |
| #include "content/browser/android/in_process/synchronous_compositor_impl.h" |
| #include "content/browser/android/overscroll_glow.h" |
| #include "content/browser/devtools/render_view_devtools_agent_host.h" |
| +#include "content/browser/gpu/compositor_util.h" |
| #include "content/browser/gpu/gpu_data_manager_impl.h" |
| #include "content/browser/gpu/gpu_process_host_ui_shim.h" |
| #include "content/browser/gpu/gpu_surface_tracker.h" |
| @@ -152,10 +153,7 @@ RenderWidgetHostViewAndroid::RenderWidgetHostViewAndroid( |
| widget_host->GetProcess()->GetID(), |
| widget_host->GetRoutingID()) != NULL), |
| frame_evictor_(new DelegatedFrameEvictor(this)), |
| - using_delegated_renderer_(CommandLine::ForCurrentProcess()->HasSwitch( |
| - switches::kEnableDelegatedRenderer) && |
| - !CommandLine::ForCurrentProcess()->HasSwitch( |
| - switches::kDisableDelegatedRenderer)), |
| + using_delegated_renderer_(IsDelegatedRendererEnabled()), |
|
reveman
2014/03/28 16:50:33
FYI, previous patch was broken as it was using the
|
| locks_on_frame_count_(0), |
| root_window_destroyed_(false) { |
| if (!using_delegated_renderer_) { |