| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CC_PLAYBACK_COMPOSITING_DISPLAY_ITEM_H_ | 5 #ifndef CC_PLAYBACK_COMPOSITING_DISPLAY_ITEM_H_ |
| 6 #define CC_PLAYBACK_COMPOSITING_DISPLAY_ITEM_H_ | 6 #define CC_PLAYBACK_COMPOSITING_DISPLAY_ITEM_H_ |
| 7 | 7 |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "cc/base/cc_export.h" | 9 #include "cc/base/cc_export.h" |
| 10 #include "cc/playback/display_item.h" | 10 #include "cc/playback/display_item.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 void SetNew(uint8_t alpha, | 26 void SetNew(uint8_t alpha, |
| 27 SkXfermode::Mode xfermode, | 27 SkXfermode::Mode xfermode, |
| 28 SkRect* bounds, | 28 SkRect* bounds, |
| 29 skia::RefPtr<SkColorFilter> color_filter); | 29 skia::RefPtr<SkColorFilter> color_filter); |
| 30 | 30 |
| 31 void ToProtobuf(proto::DisplayItem* proto) const override; | 31 void ToProtobuf(proto::DisplayItem* proto) const override; |
| 32 void FromProtobuf(const proto::DisplayItem& proto) override; | 32 void FromProtobuf(const proto::DisplayItem& proto) override; |
| 33 void Raster(SkCanvas* canvas, | 33 void Raster(SkCanvas* canvas, |
| 34 const gfx::Rect& canvas_target_playback_rect, | 34 const gfx::Rect& canvas_target_playback_rect, |
| 35 SkPicture::AbortCallback* callback) const override; | 35 SkPicture::AbortCallback* callback) const override; |
| 36 void AsValueInto(base::trace_event::TracedValue* array) const override; | 36 void AsValueInto(const gfx::Rect& visual_rect, |
| 37 base::trace_event::TracedValue* array) const override; |
| 37 | 38 |
| 38 private: | 39 private: |
| 39 uint8_t alpha_; | 40 uint8_t alpha_; |
| 40 SkXfermode::Mode xfermode_; | 41 SkXfermode::Mode xfermode_; |
| 41 bool has_bounds_; | 42 bool has_bounds_; |
| 42 SkRect bounds_; | 43 SkRect bounds_; |
| 43 skia::RefPtr<SkColorFilter> color_filter_; | 44 skia::RefPtr<SkColorFilter> color_filter_; |
| 44 }; | 45 }; |
| 45 | 46 |
| 46 class CC_EXPORT EndCompositingDisplayItem : public DisplayItem { | 47 class CC_EXPORT EndCompositingDisplayItem : public DisplayItem { |
| 47 public: | 48 public: |
| 48 EndCompositingDisplayItem(); | 49 EndCompositingDisplayItem(); |
| 49 ~EndCompositingDisplayItem() override; | 50 ~EndCompositingDisplayItem() override; |
| 50 | 51 |
| 51 static scoped_ptr<EndCompositingDisplayItem> Create() { | 52 static scoped_ptr<EndCompositingDisplayItem> Create() { |
| 52 return make_scoped_ptr(new EndCompositingDisplayItem()); | 53 return make_scoped_ptr(new EndCompositingDisplayItem()); |
| 53 } | 54 } |
| 54 | 55 |
| 55 void ToProtobuf(proto::DisplayItem* proto) const override; | 56 void ToProtobuf(proto::DisplayItem* proto) const override; |
| 56 void FromProtobuf(const proto::DisplayItem& proto) override; | 57 void FromProtobuf(const proto::DisplayItem& proto) override; |
| 57 void Raster(SkCanvas* canvas, | 58 void Raster(SkCanvas* canvas, |
| 58 const gfx::Rect& canvas_target_playback_rect, | 59 const gfx::Rect& canvas_target_playback_rect, |
| 59 SkPicture::AbortCallback* callback) const override; | 60 SkPicture::AbortCallback* callback) const override; |
| 60 void AsValueInto(base::trace_event::TracedValue* array) const override; | 61 void AsValueInto(const gfx::Rect& visual_rect, |
| 62 base::trace_event::TracedValue* array) const override; |
| 61 }; | 63 }; |
| 62 | 64 |
| 63 } // namespace cc | 65 } // namespace cc |
| 64 | 66 |
| 65 #endif // CC_PLAYBACK_COMPOSITING_DISPLAY_ITEM_H_ | 67 #endif // CC_PLAYBACK_COMPOSITING_DISPLAY_ITEM_H_ |
| OLD | NEW |