Index: cc/layers/layer_impl.h |
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h |
index 65143ab514c386de3cc217c8f73cbd467dfab298..76b33c971ceda731ee06e4bbb5686ce5b40c1b84 100644 |
--- a/cc/layers/layer_impl.h |
+++ b/cc/layers/layer_impl.h |
@@ -7,6 +7,7 @@ |
#include <set> |
#include <string> |
+#include <vector> |
#include "base/logging.h" |
#include "base/memory/scoped_ptr.h" |
@@ -18,8 +19,10 @@ |
#include "cc/base/cc_export.h" |
#include "cc/base/region.h" |
#include "cc/base/scoped_ptr_vector.h" |
+#include "cc/debug/layer_debug_info.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" |
@@ -46,6 +49,7 @@ class DictionaryValue; |
namespace cc { |
+struct DebugRect; |
class LayerTreeHostImpl; |
class LayerTreeImpl; |
class MicroBenchmarkImpl; |
@@ -469,6 +473,8 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver, |
// Note this rect is in layer space (not content space). |
void SetUpdateRect(const gfx::RectF& update_rect); |
+ virtual bool GetDetailedPaintRects(std::vector<DebugRect>*); |
+ |
const gfx::RectF& update_rect() const { return update_rect_; } |
void AddDamageRect(const gfx::RectF& damage_rect); |
@@ -542,8 +548,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; |
@@ -637,6 +643,7 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver, |
// Set for the layer that other layers are fixed to. |
bool is_container_for_fixed_position_layers_ : 1; |
+ |
Region non_fast_scrollable_region_; |
Region touch_event_handler_region_; |
SkColor background_color_; |
@@ -703,7 +710,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); |
}; |