| 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 #ifndef CC_LAYERS_SURFACE_LAYER_H_ | 5 #ifndef CC_LAYERS_SURFACE_LAYER_H_ |
| 6 #define CC_LAYERS_SURFACE_LAYER_H_ | 6 #define CC_LAYERS_SURFACE_LAYER_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" |
| 8 #include "cc/base/cc_export.h" | 9 #include "cc/base/cc_export.h" |
| 9 #include "cc/layers/layer.h" | 10 #include "cc/layers/layer.h" |
| 10 #include "cc/surfaces/surface_id.h" | 11 #include "cc/surfaces/surface_id.h" |
| 11 #include "cc/surfaces/surface_sequence.h" | 12 #include "cc/surfaces/surface_sequence.h" |
| 12 #include "ui/gfx/geometry/size.h" | 13 #include "ui/gfx/geometry/size.h" |
| 13 | 14 |
| 14 namespace cc { | 15 namespace cc { |
| 15 | 16 |
| 16 // A layer that renders a surface referencing the output of another compositor | 17 // A layer that renders a surface referencing the output of another compositor |
| 17 // instance or client. | 18 // instance or client. |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 SurfaceSequence destroy_sequence_; | 56 SurfaceSequence destroy_sequence_; |
| 56 SatisfyCallback satisfy_callback_; | 57 SatisfyCallback satisfy_callback_; |
| 57 RequireCallback require_callback_; | 58 RequireCallback require_callback_; |
| 58 | 59 |
| 59 DISALLOW_COPY_AND_ASSIGN(SurfaceLayer); | 60 DISALLOW_COPY_AND_ASSIGN(SurfaceLayer); |
| 60 }; | 61 }; |
| 61 | 62 |
| 62 } // namespace cc | 63 } // namespace cc |
| 63 | 64 |
| 64 #endif // CC_LAYERS_SURFACE_LAYER_H_ | 65 #endif // CC_LAYERS_SURFACE_LAYER_H_ |
| OLD | NEW |