| 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..edd2484ac2c4357b73863ec0d4f4a94dff1ec191 100644
|
| --- a/cc/playback/compositing_display_item.h
|
| +++ b/cc/playback/compositing_display_item.h
|
| @@ -20,7 +20,11 @@ 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,
|
| @@ -35,6 +39,8 @@ 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 override;
|
|
|
| private:
|
| uint8_t alpha_;
|
| @@ -47,6 +53,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 +67,8 @@ 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 override;
|
| };
|
|
|
| } // namespace cc
|
|
|