Index: content/browser/renderer_host/render_process_host_impl.cc |
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc |
index bb762629a254f4f86a4cd356338fb0394cb557a5..3702602cfc582ebc6c995bfacc2a2880435c4e02 100644 |
--- a/content/browser/renderer_host/render_process_host_impl.cc |
+++ b/content/browser/renderer_host/render_process_host_impl.cc |
@@ -37,6 +37,7 @@ |
#include "base/threading/thread_restrictions.h" |
#include "base/tracked_objects.h" |
#include "cc/switches.h" |
+#include "cc/util.h" |
#include "content/browser/appcache/appcache_dispatcher_host.h" |
#include "content/browser/appcache/chrome_appcache_service.h" |
#include "content/browser/browser_main.h" |
@@ -845,6 +846,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( |
switches::kWebIntentsInvocationEnabled, |
cc::switches::kBackgroundColorInsteadOfCheckerboard, |
cc::switches::kEnableCompositorFrameMessage, |
+ cc::switches::kDisableImplSidePainting, |
cc::switches::kEnableImplSidePainting, |
cc::switches::kEnablePartialSwap, |
cc::switches::kEnableRightAlignedScheduling, |
@@ -874,7 +876,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( |
} |
// Enforce the extra command line flags for impl-side painting. |
- if (browser_cmd.HasSwitch(cc::switches::kEnableImplSidePainting) && |
+ if (cc::IsImplSidePaintingEnabled(&browser_cmd) && |
!browser_cmd.HasSwitch(switches::kEnableDeferredImageDecoding)) |
renderer_cmd->AppendSwitch(switches::kEnableDeferredImageDecoding); |
} |