| Index: cc/layers/surface_layer.cc
|
| diff --git a/cc/layers/surface_layer.cc b/cc/layers/surface_layer.cc
|
| index 67a263229de0185a8e89cf039ef8266b42ff88a8..dc88810dc8aefa2258505cee6e5de754af4c0ae3 100644
|
| --- a/cc/layers/surface_layer.cc
|
| +++ b/cc/layers/surface_layer.cc
|
| @@ -36,15 +36,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) {
|
|
|