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

Unified Diff: cc/layers/content_layer.cc

Issue 16069004: cc: Remove legacy accelerated painting path (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unused variable warning Created 7 years, 7 months 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 | « no previous file | cc/output/delegating_renderer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/content_layer.cc
diff --git a/cc/layers/content_layer.cc b/cc/layers/content_layer.cc
index 9269f7c67d2e060eb43ed9402254a1d36afd4313..9bdbc53071b7b7276cefee59e3f3831d492763a4 100644
--- a/cc/layers/content_layer.cc
+++ b/cc/layers/content_layer.cc
@@ -95,21 +95,17 @@ void ContentLayer::CreateUpdaterIfNeeded() {
return;
scoped_ptr<LayerPainter> painter =
ContentLayerPainter::Create(client_).PassAs<LayerPainter>();
- if (layer_tree_host()->settings().accelerate_painting)
- updater_ = SkPictureContentLayerUpdater::Create(
- painter.Pass(),
- rendering_stats_instrumentation(),
- id());
- else if (layer_tree_host()->settings().per_tile_painting_enabled)
+ if (layer_tree_host()->settings().per_tile_painting_enabled) {
updater_ = BitmapSkPictureContentLayerUpdater::Create(
painter.Pass(),
rendering_stats_instrumentation(),
id());
- else
+ } else {
updater_ = BitmapContentLayerUpdater::Create(
painter.Pass(),
rendering_stats_instrumentation(),
id());
+ }
updater_->SetOpaque(contents_opaque());
unsigned texture_format =
« no previous file with comments | « no previous file | cc/output/delegating_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698