| Index: cc/playback/compositing_display_item.h
|
| diff --git a/cc/playback/compositing_display_item.h b/cc/playback/compositing_display_item.h
|
| index 071308ec018908022f3f70992500b7411447848c..a9e9b84979a5228e47d95bcc6f8211daa7372647 100644
|
| --- a/cc/playback/compositing_display_item.h
|
| +++ b/cc/playback/compositing_display_item.h
|
| @@ -20,14 +20,13 @@ namespace cc {
|
|
|
| class CC_EXPORT CompositingDisplayItem : public DisplayItem {
|
| public:
|
| - CompositingDisplayItem();
|
| + CompositingDisplayItem(uint8_t alpha,
|
| + SkXfermode::Mode xfermode,
|
| + SkRect* bounds,
|
| + skia::RefPtr<SkColorFilter> color_filter);
|
| + explicit CompositingDisplayItem(const proto::DisplayItem& proto);
|
| ~CompositingDisplayItem() override;
|
|
|
| - void SetNew(uint8_t alpha,
|
| - SkXfermode::Mode xfermode,
|
| - SkRect* bounds,
|
| - skia::RefPtr<SkColorFilter> color_filter);
|
| -
|
| void ToProtobuf(proto::DisplayItem* proto) const override;
|
| void FromProtobuf(const proto::DisplayItem& proto) override;
|
| void Raster(SkCanvas* canvas,
|
| @@ -35,8 +34,17 @@ class CC_EXPORT CompositingDisplayItem : public DisplayItem {
|
| SkPicture::AbortCallback* callback) const override;
|
| void AsValueInto(const gfx::Rect& visual_rect,
|
| base::trace_event::TracedValue* array) const override;
|
| + size_t ExternalMemoryUsage() const override;
|
| +
|
| + int ApproximateOpCount() const { return 1; }
|
| + bool IsSuitableForGpuRasterization() const { return true; }
|
|
|
| private:
|
| + void SetNew(uint8_t alpha,
|
| + SkXfermode::Mode xfermode,
|
| + SkRect* bounds,
|
| + skia::RefPtr<SkColorFilter> color_filter);
|
| +
|
| uint8_t alpha_;
|
| SkXfermode::Mode xfermode_;
|
| bool has_bounds_;
|
| @@ -47,6 +55,7 @@ class CC_EXPORT CompositingDisplayItem : public DisplayItem {
|
| class CC_EXPORT EndCompositingDisplayItem : public DisplayItem {
|
| public:
|
| EndCompositingDisplayItem();
|
| + explicit EndCompositingDisplayItem(const proto::DisplayItem& proto);
|
| ~EndCompositingDisplayItem() override;
|
|
|
| static scoped_ptr<EndCompositingDisplayItem> Create() {
|
| @@ -60,6 +69,10 @@ class CC_EXPORT EndCompositingDisplayItem : public DisplayItem {
|
| SkPicture::AbortCallback* callback) const override;
|
| void AsValueInto(const gfx::Rect& visual_rect,
|
| base::trace_event::TracedValue* array) const override;
|
| + size_t ExternalMemoryUsage() const override;
|
| +
|
| + int ApproximateOpCount() const { return 0; }
|
| + bool IsSuitableForGpuRasterization() const { return true; }
|
| };
|
|
|
| } // namespace cc
|
|
|