| Index: cc/resources/picture_pile_impl.h
|
| diff --git a/cc/resources/picture_pile_impl.h b/cc/resources/picture_pile_impl.h
|
| index c6c3ab3fbe4addf917d45888f98b1f1d9958a05c..ed50bec8b5836d6668f3d55e384576885383d788 100644
|
| --- a/cc/resources/picture_pile_impl.h
|
| +++ b/cc/resources/picture_pile_impl.h
|
| @@ -11,6 +11,7 @@
|
|
|
| #include "base/time/time.h"
|
| #include "cc/base/cc_export.h"
|
| +#include "cc/debug/rendering_stats_instrumentation.h"
|
| #include "cc/resources/picture_pile_base.h"
|
| #include "skia/ext/analysis_canvas.h"
|
| #include "skia/ext/refptr.h"
|
| @@ -27,16 +28,6 @@ class CC_EXPORT PicturePileImpl : public PicturePileBase {
|
| // Get paint-safe version of this picture for a specific thread.
|
| PicturePileImpl* GetCloneForDrawingOnThread(unsigned thread_index) const;
|
|
|
| - struct CC_EXPORT RasterStats {
|
| - // Minimum rasterize time from N runs
|
| - // N=max(1,slow-down-raster-scale-factor)
|
| - base::TimeDelta best_rasterize_time;
|
| - // Total rasterize time for all N runs
|
| - base::TimeDelta total_rasterize_time;
|
| - // Total number of pixels rasterize in all N runs
|
| - int64 total_pixels_rasterized;
|
| - };
|
| -
|
| // Raster a subrect of this PicturePileImpl into the given canvas.
|
| // It's only safe to call paint on a cloned version. It is assumed
|
| // that contents_scale has already been applied to this canvas.
|
| @@ -49,7 +40,7 @@ class CC_EXPORT PicturePileImpl : public PicturePileBase {
|
| SkCanvas* canvas,
|
| gfx::Rect canvas_rect,
|
| float contents_scale,
|
| - RasterStats* raster_stats);
|
| + RenderingStatsInstrumentation* rendering_stats_instrumentation);
|
|
|
| // Similar to the above RasterDirect method, but this is a convenience method
|
| // for when it is known that the raster is going to an intermediate bitmap
|
| @@ -58,7 +49,7 @@ class CC_EXPORT PicturePileImpl : public PicturePileBase {
|
| SkCanvas* canvas,
|
| gfx::Rect canvas_rect,
|
| float contents_scale,
|
| - RasterStats* raster_stats);
|
| + RenderingStatsInstrumentation* stats_instrumentation);
|
|
|
| // Called when analyzing a tile. We can use AnalysisCanvas as
|
| // SkDrawPictureCallback, which allows us to early out from analysis.
|
| @@ -137,7 +128,7 @@ class CC_EXPORT PicturePileImpl : public PicturePileBase {
|
| SkDrawPictureCallback* callback,
|
| gfx::Rect canvas_rect,
|
| float contents_scale,
|
| - RasterStats* raster_stats);
|
| + RenderingStatsInstrumentation* rendering_stats_instrumentation);
|
|
|
| // Once instantiated, |clones_for_drawing_| can't be modified. This
|
| // guarantees thread-safe access during the life time of a PicturePileImpl
|
|
|