| 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 110901155525be65159137d74ca0219c4ebb4ef5..f163cf3f1f8dd485ce03e29f6fb49234292b1795 100644
|
| --- a/content/browser/renderer_host/render_process_host_impl.cc
|
| +++ b/content/browser/renderer_host/render_process_host_impl.cc
|
| @@ -913,6 +913,9 @@ static void AppendGpuCommandLineFlags(CommandLine* command_line) {
|
| if (content::IsDelegatedRendererEnabled())
|
| command_line->AppendSwitch(switches::kEnableDelegatedRenderer);
|
|
|
| + if (content::IsImplSidePaintingEnabled())
|
| + command_line->AppendSwitch(switches::kEnableImplSidePainting);
|
| +
|
| // Appending disable-gpu-feature switches due to software rendering list.
|
| GpuDataManagerImpl* gpu_data_manager = GpuDataManagerImpl::GetInstance();
|
| DCHECK(gpu_data_manager);
|
| @@ -988,9 +991,12 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
|
| switches::kDisableGpuCompositing,
|
| switches::kDisableGpuVsync,
|
| switches::kDisableHistogramCustomizer,
|
| + switches::kDisableImplSidePainting,
|
| + switches::kDisableLCDText,
|
| switches::kDisableLayerSquashing,
|
| switches::kDisableLocalStorage,
|
| switches::kDisableLogging,
|
| + switches::kDisableMapImage,
|
| switches::kDisableOpusPlayback,
|
| switches::kDisableOverlayScrollbar,
|
| switches::kDisablePinch,
|
| @@ -1033,10 +1039,13 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
|
| switches::kEnableGPUServiceLogging,
|
| switches::kEnableHighDpiCompositingForFixedPosition,
|
| switches::kEnableHTMLImports,
|
| + switches::kEnableImplSidePainting,
|
| switches::kEnableInbandTextTracks,
|
| + switches::kEnableLCDText,
|
| switches::kEnableLayerSquashing,
|
| switches::kEnableLogging,
|
| switches::kEnableMP3StreamParser,
|
| + switches::kEnableMapImage,
|
| switches::kEnableMemoryBenchmarking,
|
| switches::kEnableOverlayFullscreenVideo,
|
| switches::kEnableOverlayScrollbar,
|
| @@ -1075,6 +1084,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
|
| switches::kNumRasterThreads,
|
| switches::kPpapiInProcess,
|
| switches::kProfilerTiming,
|
| + switches::kRasterizationSite,
|
| switches::kReduceSecurityForTesting,
|
| switches::kRegisterPepperPlugins,
|
| switches::kRendererAssertTest,
|
| @@ -1101,16 +1111,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
|
| cc::switches::kCompositeToMailbox,
|
| cc::switches::kDisableCompositedAntialiasing,
|
| cc::switches::kDisableCompositorTouchHitTesting,
|
| - cc::switches::kDisableGPURasterization,
|
| - cc::switches::kDisableImplSidePainting,
|
| - cc::switches::kDisableLCDText,
|
| - cc::switches::kDisableMapImage,
|
| cc::switches::kDisableThreadedAnimation,
|
| cc::switches::kEnableGpuBenchmarking,
|
| - cc::switches::kEnableGPURasterization,
|
| - cc::switches::kEnableImplSidePainting,
|
| - cc::switches::kEnableLCDText,
|
| - cc::switches::kEnableMapImage,
|
| cc::switches::kEnablePinchVirtualViewport,
|
| cc::switches::kEnableTopControlsPositionCalculation,
|
| cc::switches::kMaxTilesForInterestArea,
|
| @@ -1194,7 +1196,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
|
| }
|
|
|
| // Enforce the extra command line flags for impl-side painting.
|
| - if (cc::switches::IsImplSidePaintingEnabled() &&
|
| + if (IsImplSidePaintingEnabled() &&
|
| !browser_cmd.HasSwitch(switches::kEnableDeferredImageDecoding))
|
| renderer_cmd->AppendSwitch(switches::kEnableDeferredImageDecoding);
|
| }
|
|
|