OLD | NEW |
1 // Copyright 2010 The Chromium Authors. All rights reserved. | 1 // Copyright 2010 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_LAYER_H_ | 5 #ifndef CC_LAYERS_LAYER_H_ |
6 #define CC_LAYERS_LAYER_H_ | 6 #define CC_LAYERS_LAYER_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
513 | 513 |
514 // Transient properties. | 514 // Transient properties. |
515 float raster_scale_; | 515 float raster_scale_; |
516 | 516 |
517 ScopedPtrVector<CopyOutputRequest> copy_requests_; | 517 ScopedPtrVector<CopyOutputRequest> copy_requests_; |
518 | 518 |
519 base::Closure did_scroll_callback_; | 519 base::Closure did_scroll_callback_; |
520 | 520 |
521 DrawProperties<Layer, RenderSurface> draw_properties_; | 521 DrawProperties<Layer, RenderSurface> draw_properties_; |
522 | 522 |
| 523 bool saved_paint_properties_; |
523 PaintProperties paint_properties_; | 524 PaintProperties paint_properties_; |
524 | 525 |
525 DISALLOW_COPY_AND_ASSIGN(Layer); | 526 DISALLOW_COPY_AND_ASSIGN(Layer); |
526 }; | 527 }; |
527 | 528 |
528 } // namespace cc | 529 } // namespace cc |
529 | 530 |
530 #endif // CC_LAYERS_LAYER_H_ | 531 #endif // CC_LAYERS_LAYER_H_ |
OLD | NEW |