Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(296)

Unified Diff: cc/content_layer.cc

Issue 11361223: cc: Remove cc::settings, move them to LayerTreeSettings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix-unittests Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/cc_tests.gyp ('k') | cc/gl_renderer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/content_layer.cc
diff --git a/cc/content_layer.cc b/cc/content_layer.cc
index 5f4689674fa18529adcc292f70b5a8a7e7c89b6c..b34ce107e0ced197af3d767f4dc3b8c67f74016f 100644
--- a/cc/content_layer.cc
+++ b/cc/content_layer.cc
@@ -11,7 +11,6 @@
#include "cc/content_layer_client.h"
#include "cc/layer_painter.h"
#include "cc/layer_tree_host.h"
-#include "cc/settings.h"
namespace cc {
@@ -87,7 +86,7 @@ void ContentLayer::createUpdaterIfNeeded()
scoped_ptr<LayerPainter> painter = ContentLayerPainter::create(m_client).PassAs<LayerPainter>();
if (layerTreeHost()->settings().acceleratePainting)
m_updater = SkPictureContentLayerUpdater::create(painter.Pass());
- else if (Settings::perTilePaintingEnabled())
+ else if (layerTreeHost()->settings().perTilePaintingEnabled)
m_updater = BitmapSkPictureContentLayerUpdater::create(painter.Pass());
else
m_updater = BitmapContentLayerUpdater::create(painter.Pass());
« no previous file with comments | « cc/cc_tests.gyp ('k') | cc/gl_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698