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

Unified Diff: cc/layers/surface_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/surface_layer.cc
diff --git a/cc/layers/surface_layer.cc b/cc/layers/surface_layer.cc
index 1a690b6eb025e21522f9b76813c8e9ee914d077f..2d50182a49ae2adb9edc15382fa05a9e3ae47f94 100644
--- a/cc/layers/surface_layer.cc
+++ b/cc/layers/surface_layer.cc
@@ -35,15 +35,17 @@ class SatisfySwapPromise : public SwapPromise {
};
scoped_refptr<SurfaceLayer> SurfaceLayer::Create(
+ const LayerSettings& settings,
const SatisfyCallback& satisfy_callback,
const RequireCallback& require_callback) {
return make_scoped_refptr(
- new SurfaceLayer(satisfy_callback, require_callback));
+ new SurfaceLayer(settings, satisfy_callback, require_callback));
}
-SurfaceLayer::SurfaceLayer(const SatisfyCallback& satisfy_callback,
+SurfaceLayer::SurfaceLayer(const LayerSettings& settings,
+ const SatisfyCallback& satisfy_callback,
const RequireCallback& require_callback)
- : Layer(),
+ : Layer(settings),
surface_scale_(1.f),
satisfy_callback_(satisfy_callback),
require_callback_(require_callback) {

Powered by Google App Engine
This is Rietveld 408576698