| Index: cc/playback/clip_path_display_item.h
|
| diff --git a/cc/playback/clip_path_display_item.h b/cc/playback/clip_path_display_item.h
|
| index 3cb6dc8609b3018bc66bf8198b2879057d05a038..bc7afc31d86fb8cc274d78cd34941b7da90dea0e 100644
|
| --- a/cc/playback/clip_path_display_item.h
|
| +++ b/cc/playback/clip_path_display_item.h
|
| @@ -7,15 +7,10 @@
|
|
|
| #include <stddef.h>
|
|
|
| -#include <memory>
|
| -
|
| -#include "base/memory/ptr_util.h"
|
| #include "cc/base/cc_export.h"
|
| #include "cc/playback/display_item.h"
|
| #include "third_party/skia/include/core/SkPath.h"
|
|
|
| -class SkCanvas;
|
| -
|
| namespace cc {
|
|
|
| class CC_EXPORT ClipPathDisplayItem : public DisplayItem {
|
| @@ -23,9 +18,6 @@ class CC_EXPORT ClipPathDisplayItem : public DisplayItem {
|
| ClipPathDisplayItem(const SkPath& path, bool antialias);
|
| ~ClipPathDisplayItem() override;
|
|
|
| - void Raster(SkCanvas* canvas,
|
| - SkPicture::AbortCallback* callback) const override;
|
| -
|
| size_t ExternalMemoryUsage() const {
|
| // The size of SkPath's external storage is not currently accounted for (and
|
| // may well be shared anyway).
|
| @@ -33,13 +25,8 @@ class CC_EXPORT ClipPathDisplayItem : public DisplayItem {
|
| }
|
| int ApproximateOpCount() const { return 1; }
|
|
|
| - const SkPath& clip_path() const { return clip_path_; }
|
| -
|
| - private:
|
| - void SetNew(const SkPath& path, bool antialias);
|
| -
|
| - SkPath clip_path_;
|
| - bool antialias_;
|
| + const SkPath clip_path;
|
| + const bool antialias;
|
| };
|
|
|
| class CC_EXPORT EndClipPathDisplayItem : public DisplayItem {
|
| @@ -47,13 +34,6 @@ class CC_EXPORT EndClipPathDisplayItem : public DisplayItem {
|
| EndClipPathDisplayItem();
|
| ~EndClipPathDisplayItem() override;
|
|
|
| - static std::unique_ptr<EndClipPathDisplayItem> Create() {
|
| - return base::MakeUnique<EndClipPathDisplayItem>();
|
| - }
|
| -
|
| - void Raster(SkCanvas* canvas,
|
| - SkPicture::AbortCallback* callback) const override;
|
| -
|
| int ApproximateOpCount() const { return 0; }
|
| };
|
|
|
|
|