Index: cc/layers/layer_impl.h |
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h |
index 8af8c3de3e9d08a16e863256d05906d908fdbfd9..fbad1b5077165c47a0a63bab9cfd25f6b3f80fae 100644 |
--- a/cc/layers/layer_impl.h |
+++ b/cc/layers/layer_impl.h |
@@ -20,6 +20,7 @@ |
#include "cc/base/scoped_ptr_vector.h" |
#include "cc/input/input_handler.h" |
#include "cc/layers/draw_properties.h" |
+#include "cc/layers/layer_client.h" |
#include "cc/layers/layer_lists.h" |
#include "cc/layers/layer_position_constraint.h" |
#include "cc/layers/render_surface_impl.h" |
@@ -469,6 +470,13 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver, |
// Note this rect is in layer space (not content space). |
void SetUpdateRect(const gfx::RectF& update_rect); |
+ bool includes_first_paint_invalidation() const { |
+ return includes_first_paint_invalidation_; |
+ } |
+ void SetIncludesFirstPaintInvalidation(bool b) { |
+ includes_first_paint_invalidation_ = b; |
+ } |
+ |
const gfx::RectF& update_rect() const { return update_rect_; } |
void AddDamageRect(const gfx::RectF& damage_rect); |
@@ -541,8 +549,8 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver, |
virtual void RunMicroBenchmark(MicroBenchmarkImpl* benchmark); |
- virtual void SetDebugInfo( |
- scoped_refptr<base::debug::ConvertableToTraceFormat> other); |
+ virtual void SetDebugInfo(scoped_refptr<LayerDebugInfo> other); |
+ scoped_refptr<LayerDebugInfo> debug_info() const { return debug_info_; } |
bool IsDrawnRenderSurfaceLayerListMember() const; |
@@ -636,6 +644,9 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver, |
// Set for the layer that other layers are fixed to. |
bool is_container_for_fixed_position_layers_ : 1; |
+ |
+ bool includes_first_paint_invalidation_ : 1; |
+ |
Region non_fast_scrollable_region_; |
Region touch_event_handler_region_; |
SkColor background_color_; |
@@ -702,7 +713,7 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver, |
// hierarchy before layers can be drawn. |
DrawProperties<LayerImpl> draw_properties_; |
- scoped_refptr<base::debug::ConvertableToTraceFormat> debug_info_; |
+ scoped_refptr<LayerDebugInfo> debug_info_; |
DISALLOW_COPY_AND_ASSIGN(LayerImpl); |
}; |