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

Unified Diff: cc/layers/content_layer.cc

Issue 1101823002: CC Animations: Make LayerAnimationController creation optional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Plumb LayerSettings parameter for cc::Layer construction. Created 5 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
Index: cc/layers/content_layer.cc
diff --git a/cc/layers/content_layer.cc b/cc/layers/content_layer.cc
index 7efa1c20b0043852d3a79323ec27ee79b57c785b..295577303c3ad2432671eca80d0400a4b2688b55 100644
--- a/cc/layers/content_layer.cc
+++ b/cc/layers/content_layer.cc
@@ -30,12 +30,14 @@ void ContentLayerPainter::Paint(SkCanvas* canvas,
ContentLayerClient::PAINTING_BEHAVIOR_NORMAL);
}
-scoped_refptr<ContentLayer> ContentLayer::Create(ContentLayerClient* client) {
- return make_scoped_refptr(new ContentLayer(client));
+scoped_refptr<ContentLayer> ContentLayer::Create(const LayerSettings& settings,
+ ContentLayerClient* client) {
+ return make_scoped_refptr(new ContentLayer(settings, client));
}
-ContentLayer::ContentLayer(ContentLayerClient* client)
- : TiledLayer(), client_(client) {
+ContentLayer::ContentLayer(const LayerSettings& settings,
+ ContentLayerClient* client)
+ : TiledLayer(settings), client_(client) {
}
ContentLayer::~ContentLayer() {}

Powered by Google App Engine
This is Rietveld 408576698