Commit 139eed2f authored by danakj@chromium.org's avatar danakj@chromium.org

Remove --enable-per-tile-painting and --ui-enable-per-tile-painting.

The ui flag is always true on ChromeOS and off elsewhere. The other is
never on and we're not planning to turn it on.

R=piman
BUG=

Review URL: https://codereview.chromium.org/164183012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251538 0039d316-1c4b-4281-b951-d872f2087c98
parent c9f92120
...@@ -86,9 +86,6 @@ const char kEnablePartialSwap[] = "enable-partial-swap"; ...@@ -86,9 +86,6 @@ const char kEnablePartialSwap[] = "enable-partial-swap";
// Disable partial swap which is needed for some OpenGL drivers / emulators. // Disable partial swap which is needed for some OpenGL drivers / emulators.
const char kUIDisablePartialSwap[] = "ui-disable-partial-swap"; const char kUIDisablePartialSwap[] = "ui-disable-partial-swap";
const char kEnablePerTilePainting[] = "enable-per-tile-painting";
const char kUIEnablePerTilePainting[] = "ui-enable-per-tile-painting";
// Enables the GPU benchmarking extension // Enables the GPU benchmarking extension
const char kEnableGpuBenchmarking[] = "enable-gpu-benchmarking"; const char kEnableGpuBenchmarking[] = "enable-gpu-benchmarking";
......
...@@ -45,8 +45,6 @@ CC_EXPORT extern const char kDisableCompositorTouchHitTesting[]; ...@@ -45,8 +45,6 @@ CC_EXPORT extern const char kDisableCompositorTouchHitTesting[];
// Switches for both the renderer and ui compositors. // Switches for both the renderer and ui compositors.
CC_EXPORT extern const char kUIDisablePartialSwap[]; CC_EXPORT extern const char kUIDisablePartialSwap[];
CC_EXPORT extern const char kEnablePerTilePainting[];
CC_EXPORT extern const char kUIEnablePerTilePainting[];
CC_EXPORT extern const char kEnableGpuBenchmarking[]; CC_EXPORT extern const char kEnableGpuBenchmarking[];
// Debug visualizations. // Debug visualizations.
......
...@@ -876,13 +876,6 @@ const Experiment kExperiments[] = { ...@@ -876,13 +876,6 @@ const Experiment kExperiments[] = {
kOsDesktop, kOsDesktop,
SINGLE_VALUE_TYPE(switches::kDisableVp8AlphaPlayback) SINGLE_VALUE_TYPE(switches::kDisableVp8AlphaPlayback)
}, },
{
"per-tile-painting",
IDS_FLAGS_PER_TILE_PAINTING_NAME,
IDS_FLAGS_PER_TILE_PAINTING_DESCRIPTION,
kOsMac | kOsLinux | kOsCrOS,
SINGLE_VALUE_TYPE(cc::switches::kEnablePerTilePainting)
},
{ {
"enable-javascript-harmony", "enable-javascript-harmony",
IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_NAME, IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_NAME,
......
...@@ -180,7 +180,6 @@ std::string DeriveCommandLine(const GURL& start_url, ...@@ -180,7 +180,6 @@ std::string DeriveCommandLine(const GURL& start_url,
cc::switches::kEnableImplSidePainting, cc::switches::kEnableImplSidePainting,
cc::switches::kEnableMapImage, cc::switches::kEnableMapImage,
cc::switches::kEnablePartialSwap, cc::switches::kEnablePartialSwap,
cc::switches::kEnablePerTilePainting,
cc::switches::kEnablePinchVirtualViewport, cc::switches::kEnablePinchVirtualViewport,
cc::switches::kEnableTopControlsPositionCalculation, cc::switches::kEnableTopControlsPositionCalculation,
cc::switches::kMaxTilesForInterestArea, cc::switches::kMaxTilesForInterestArea,
...@@ -197,7 +196,6 @@ std::string DeriveCommandLine(const GURL& start_url, ...@@ -197,7 +196,6 @@ std::string DeriveCommandLine(const GURL& start_url,
cc::switches::kSlowDownRasterScaleFactor, cc::switches::kSlowDownRasterScaleFactor,
cc::switches::kTraceOverdraw, cc::switches::kTraceOverdraw,
cc::switches::kUIDisablePartialSwap, cc::switches::kUIDisablePartialSwap,
cc::switches::kUIEnablePerTilePainting,
chromeos::switches::kDbusStub, chromeos::switches::kDbusStub,
chromeos::switches::kDisableLoginAnimations, chromeos::switches::kDisableLoginAnimations,
chromeos::switches::kDisableOobeAnimation, chromeos::switches::kDisableOobeAnimation,
......
...@@ -1113,7 +1113,6 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( ...@@ -1113,7 +1113,6 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
cc::switches::kEnableLCDText, cc::switches::kEnableLCDText,
cc::switches::kEnableMapImage, cc::switches::kEnableMapImage,
cc::switches::kEnablePartialSwap, cc::switches::kEnablePartialSwap,
cc::switches::kEnablePerTilePainting,
cc::switches::kEnablePinchVirtualViewport, cc::switches::kEnablePinchVirtualViewport,
cc::switches::kEnableTopControlsPositionCalculation, cc::switches::kEnableTopControlsPositionCalculation,
cc::switches::kMaxTilesForInterestArea, cc::switches::kMaxTilesForInterestArea,
......
...@@ -95,8 +95,6 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create( ...@@ -95,8 +95,6 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
!cmd->HasSwitch(switches::kDisableDeadlineScheduling); !cmd->HasSwitch(switches::kDisableDeadlineScheduling);
settings.using_synchronous_renderer_compositor = settings.using_synchronous_renderer_compositor =
widget->UsingSynchronousRendererCompositor(); widget->UsingSynchronousRendererCompositor();
settings.per_tile_painting_enabled =
cmd->HasSwitch(cc::switches::kEnablePerTilePainting);
settings.accelerated_animation_enabled = settings.accelerated_animation_enabled =
!cmd->HasSwitch(cc::switches::kDisableThreadedAnimation); !cmd->HasSwitch(cc::switches::kDisableThreadedAnimation);
settings.touch_hit_testing = settings.touch_hit_testing =
......
...@@ -213,8 +213,9 @@ Compositor::Compositor(gfx::AcceleratedWidget widget) ...@@ -213,8 +213,9 @@ Compositor::Compositor(gfx::AcceleratedWidget widget)
switches::IsUIDeadlineSchedulingEnabled(); switches::IsUIDeadlineSchedulingEnabled();
settings.partial_swap_enabled = settings.partial_swap_enabled =
!command_line->HasSwitch(cc::switches::kUIDisablePartialSwap); !command_line->HasSwitch(cc::switches::kUIDisablePartialSwap);
settings.per_tile_painting_enabled = #if defined(OS_CHROMEOS)
command_line->HasSwitch(cc::switches::kUIEnablePerTilePainting); settings.per_tile_painting_enabled = true;
#endif
// These flags should be mirrored by renderer versions in content/renderer/. // These flags should be mirrored by renderer versions in content/renderer/.
settings.initial_debug_state.show_debug_borders = settings.initial_debug_state.show_debug_borders =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment