| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/layers/surface_layer.h" | 5 #include "cc/layers/surface_layer.h" |
| 6 | 6 |
| 7 #include "cc/layers/surface_layer_impl.h" | 7 #include "cc/layers/surface_layer_impl.h" |
| 8 #include "cc/output/swap_promise.h" | 8 #include "cc/output/swap_promise.h" |
| 9 #include "cc/trees/layer_tree_host.h" | 9 #include "cc/trees/layer_tree_host.h" |
| 10 | 10 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 } | 28 } |
| 29 int64 TraceId() const override { return 0; } | 29 int64 TraceId() const override { return 0; } |
| 30 | 30 |
| 31 SurfaceSequence sequence_; | 31 SurfaceSequence sequence_; |
| 32 SurfaceLayer::SatisfyCallback satisfy_callback_; | 32 SurfaceLayer::SatisfyCallback satisfy_callback_; |
| 33 | 33 |
| 34 DISALLOW_COPY_AND_ASSIGN(SatisfySwapPromise); | 34 DISALLOW_COPY_AND_ASSIGN(SatisfySwapPromise); |
| 35 }; | 35 }; |
| 36 | 36 |
| 37 scoped_refptr<SurfaceLayer> SurfaceLayer::Create( | 37 scoped_refptr<SurfaceLayer> SurfaceLayer::Create( |
| 38 const LayerSettings& settings, |
| 38 const SatisfyCallback& satisfy_callback, | 39 const SatisfyCallback& satisfy_callback, |
| 39 const RequireCallback& require_callback) { | 40 const RequireCallback& require_callback) { |
| 40 return make_scoped_refptr( | 41 return make_scoped_refptr( |
| 41 new SurfaceLayer(satisfy_callback, require_callback)); | 42 new SurfaceLayer(settings, satisfy_callback, require_callback)); |
| 42 } | 43 } |
| 43 | 44 |
| 44 SurfaceLayer::SurfaceLayer(const SatisfyCallback& satisfy_callback, | 45 SurfaceLayer::SurfaceLayer(const LayerSettings& settings, |
| 46 const SatisfyCallback& satisfy_callback, |
| 45 const RequireCallback& require_callback) | 47 const RequireCallback& require_callback) |
| 46 : Layer(), | 48 : Layer(settings), |
| 47 surface_scale_(1.f), | 49 surface_scale_(1.f), |
| 48 satisfy_callback_(satisfy_callback), | 50 satisfy_callback_(satisfy_callback), |
| 49 require_callback_(require_callback) { | 51 require_callback_(require_callback) { |
| 50 } | 52 } |
| 51 | 53 |
| 52 SurfaceLayer::~SurfaceLayer() { | 54 SurfaceLayer::~SurfaceLayer() { |
| 53 DCHECK(!layer_tree_host()); | 55 DCHECK(!layer_tree_host()); |
| 54 DCHECK(destroy_sequence_.is_null()); | 56 DCHECK(destroy_sequence_.is_null()); |
| 55 } | 57 } |
| 56 | 58 |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 if (!layer_tree_host()) | 116 if (!layer_tree_host()) |
| 115 return; | 117 return; |
| 116 DCHECK(!destroy_sequence_.is_null()); | 118 DCHECK(!destroy_sequence_.is_null()); |
| 117 scoped_ptr<SatisfySwapPromise> satisfy( | 119 scoped_ptr<SatisfySwapPromise> satisfy( |
| 118 new SatisfySwapPromise(destroy_sequence_, satisfy_callback_)); | 120 new SatisfySwapPromise(destroy_sequence_, satisfy_callback_)); |
| 119 layer_tree_host()->QueueSwapPromise(satisfy.Pass()); | 121 layer_tree_host()->QueueSwapPromise(satisfy.Pass()); |
| 120 destroy_sequence_ = SurfaceSequence(); | 122 destroy_sequence_ = SurfaceSequence(); |
| 121 } | 123 } |
| 122 | 124 |
| 123 } // namespace cc | 125 } // namespace cc |
| OLD | NEW |