| Index: cc/resources/compositing_display_item.h
|
| diff --git a/cc/resources/compositing_display_item.h b/cc/resources/compositing_display_item.h
|
| index 992403f3120a4e8911002a46c04777b0b34226ec..8dcf0aebbe07e1578d883066640ab842325b705a 100644
|
| --- a/cc/resources/compositing_display_item.h
|
| +++ b/cc/resources/compositing_display_item.h
|
| @@ -21,16 +21,13 @@ namespace cc {
|
|
|
| class CC_EXPORT CompositingDisplayItem : public DisplayItem {
|
| public:
|
| + CompositingDisplayItem();
|
| ~CompositingDisplayItem() override;
|
|
|
| - static scoped_ptr<CompositingDisplayItem> Create(
|
| - uint8_t alpha,
|
| - SkXfermode::Mode xfermode,
|
| - SkRect* bounds,
|
| - skia::RefPtr<SkColorFilter> color_filter) {
|
| - return make_scoped_ptr(
|
| - new CompositingDisplayItem(alpha, xfermode, bounds, color_filter));
|
| - }
|
| + void SetNew(uint8_t alpha,
|
| + SkXfermode::Mode xfermode,
|
| + SkRect* bounds,
|
| + skia::RefPtr<SkColorFilter> color_filter);
|
|
|
| void Raster(SkCanvas* canvas, SkDrawPictureCallback* callback) const override;
|
|
|
| @@ -55,6 +52,7 @@ class CC_EXPORT CompositingDisplayItem : public DisplayItem {
|
|
|
| class CC_EXPORT EndCompositingDisplayItem : public DisplayItem {
|
| public:
|
| + EndCompositingDisplayItem();
|
| ~EndCompositingDisplayItem() override;
|
|
|
| static scoped_ptr<EndCompositingDisplayItem> Create() {
|
| @@ -67,9 +65,6 @@ class CC_EXPORT EndCompositingDisplayItem : public DisplayItem {
|
| int ApproximateOpCount() const override;
|
| size_t PictureMemoryUsage() const override;
|
| void AsValueInto(base::trace_event::TracedValue* array) const override;
|
| -
|
| - protected:
|
| - EndCompositingDisplayItem();
|
| };
|
|
|
| } // namespace cc
|
|
|