summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorvmpstr@chromium.org <vmpstr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-15 20:41:53 +0000
committervmpstr@chromium.org <vmpstr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-15 20:41:53 +0000
commitc8bbda0fd7d40dc732ccb5440963002fccbe1643 (patch)
tree65bfa6339997f84950aa837e24d496735b2c8985 /content
parentda2f3f678be1a7d7b9835475d1032739e5d5a62f (diff)
downloadchromium_src-c8bbda0fd7d40dc732ccb5440963002fccbe1643.zip
chromium_src-c8bbda0fd7d40dc732ccb5440963002fccbe1643.tar.gz
chromium_src-c8bbda0fd7d40dc732ccb5440963002fccbe1643.tar.bz2
cc: Enable solid color prediction by default
This change flips the "use-color-estimator" flag to become "disable-color-estimator" flag and enables color prediction by default. BUG=181619 Review URL: https://chromiumcodereview.appspot.com/12408011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188467 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/render_process_host_impl.cc2
-rw-r--r--content/renderer/gpu/render_widget_compositor.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 422e53e..777e5ac 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -879,6 +879,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
switches::kVModule,
switches::kWebCoreLogChannels,
cc::switches::kBackgroundColorInsteadOfCheckerboard,
+ cc::switches::kDisableColorEstimator,
cc::switches::kDisableImplSidePainting,
cc::switches::kDisableThreadedAnimation,
cc::switches::kEnableCompositorFrameMessage,
@@ -903,7 +904,6 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
cc::switches::kTraceAllRenderedFrames,
cc::switches::kTraceOverdraw,
cc::switches::kUseCheapnessEstimator,
- cc::switches::kUseColorEstimator,
cc::switches::kCompositeToMailbox,
};
renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames,
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index 0f0b99e..4bcf9dd 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -128,7 +128,7 @@ scoped_ptr<RenderWidgetCompositor> RenderWidgetCompositor::Create(
settings.useCheapnessEstimator =
cmd->HasSwitch(cc::switches::kUseCheapnessEstimator);
settings.useColorEstimator =
- cmd->HasSwitch(cc::switches::kUseColorEstimator);
+ !cmd->HasSwitch(cc::switches::kDisableColorEstimator);
settings.predictionBenchmarking =
cmd->HasSwitch(cc::switches::kEnablePredictionBenchmarking);