| Index: ui/compositor/paint_cache.h
|
| diff --git a/ui/compositor/paint_cache.h b/ui/compositor/paint_cache.h
|
| index 599a8ac355340aeaa9b4c92a5e48cf374fd5ec9f..79e2fa9b20292139bd7b772a5e1d635e391a9f75 100644
|
| --- a/ui/compositor/paint_cache.h
|
| +++ b/ui/compositor/paint_cache.h
|
| @@ -5,13 +5,9 @@
|
| #ifndef UI_COMPOSITOR_PAINT_CACHE_H_
|
| #define UI_COMPOSITOR_PAINT_CACHE_H_
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include "cc/resources/drawing_display_item.h"
|
| #include "ui/compositor/compositor_export.h"
|
|
|
| -namespace cc {
|
| -class DrawingDisplayItem;
|
| -}
|
| -
|
| namespace ui {
|
| class PaintContext;
|
| class PaintRecorder;
|
| @@ -33,9 +29,10 @@ class COMPOSITOR_EXPORT PaintCache {
|
| // Only PaintRecorder can modify these.
|
| friend PaintRecorder;
|
|
|
| - void SetCache(scoped_ptr<cc::DrawingDisplayItem> item);
|
| + void SetCache(const cc::DrawingDisplayItem* item);
|
|
|
| - scoped_ptr<cc::DrawingDisplayItem> display_item_;
|
| + bool has_cache_;
|
| + cc::DrawingDisplayItem display_item_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PaintCache);
|
| };
|
|
|