summaryrefslogtreecommitdiffstats
path: root/cc/content_layer.cc
diff options
context:
space:
mode:
authoraelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-19 03:39:37 +0000
committeraelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-19 03:39:37 +0000
commit65bfd9976b93353a62da4946206448a0e4dd0ba1 (patch)
treea0237b4901796ab7e74caad09baadf90b64ce613 /cc/content_layer.cc
parent789ad9876d1e731046b0bf648f43bbe1ac0836c1 (diff)
downloadchromium_src-65bfd9976b93353a62da4946206448a0e4dd0ba1.zip
chromium_src-65bfd9976b93353a62da4946206448a0e4dd0ba1.tar.gz
chromium_src-65bfd9976b93353a62da4946206448a0e4dd0ba1.tar.bz2
Move CC switches to cc/switches.h.
This moves these switches to their appropriate place, and sets them all directly from command-line flags there. I deleted the WebCompositor setter methods, but setters are still needed in CCSettings for unit tests. BUG= Review URL: https://chromiumcodereview.appspot.com/11186039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162921 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/content_layer.cc')
-rw-r--r--cc/content_layer.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/content_layer.cc b/cc/content_layer.cc
index 6de4dff..f99e2d3 100644
--- a/cc/content_layer.cc
+++ b/cc/content_layer.cc
@@ -90,7 +90,7 @@ void ContentLayerChromium::createTextureUpdaterIfNeeded()
scoped_ptr<LayerPainterChromium> painter = ContentLayerPainter::create(m_client).PassAs<LayerPainterChromium>();
if (layerTreeHost()->settings().acceleratePainting)
m_textureUpdater = FrameBufferSkPictureCanvasLayerTextureUpdater::create(painter.Pass());
- else if (CCSettings::perTilePaintingEnabled())
+ else if (Settings::perTilePaintingEnabled())
m_textureUpdater = BitmapSkPictureCanvasLayerTextureUpdater::create(painter.Pass());
else
m_textureUpdater = BitmapCanvasLayerTextureUpdater::create(painter.Pass());