diff options
| author | Nigel Tao <nigeltao@google.com> | 2018-08-31 09:31:25 +1000 |
|---|---|---|
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-09-04 14:14:20 +0000 |
| commit | 3cd0c2496cf5acefcc6aaf0edd5489e066042c7d (patch) | |
| tree | af84821b2414d89b3de483882b2df4581519be36 /src | |
| parent | 328f9c72ee9a5ffe76f886bd83b17f50ef7a573c (diff) | |
| download | skqp-3cd0c2496cf5acefcc6aaf0edd5489e066042c7d.tar.gz | |
Add an explicit SkFrame move constructor
Bug: skia:
Change-Id: I2f1c1ebf329e8913b4fb72efe53ff1a435989230
Reviewed-on: https://skia-review.googlesource.com/150300
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/codec/SkFrameHolder.h | 11 | ||||
| -rw-r--r-- | src/codec/SkWebpCodec.h | 4 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/codec/SkFrameHolder.h b/src/codec/SkFrameHolder.h index ab308b39db..7ac015ba07 100644 --- a/src/codec/SkFrameHolder.h +++ b/src/codec/SkFrameHolder.h @@ -35,6 +35,17 @@ public: virtual ~SkFrame() {} /** + * An explicit move constructor, as + * https://en.cppreference.com/w/cpp/language/move_constructor says that + * there is no implicit move constructor if there are user-declared + * destructors, and we have one, immediately above. + * + * Without a move constructor, it is harder to use an SkFrame, or an + * SkFrame subclass, inside a std::vector. + */ + SkFrame(SkFrame&&) = default; + + /** * 0-based index of the frame in the image sequence. */ int frameId() const { return fId; } diff --git a/src/codec/SkWebpCodec.h b/src/codec/SkWebpCodec.h index 4de5f38b13..b4b4677e89 100644 --- a/src/codec/SkWebpCodec.h +++ b/src/codec/SkWebpCodec.h @@ -61,10 +61,6 @@ private: : INHERITED(i) , fReportedAlpha(alpha) {} - Frame(Frame&& other) - : INHERITED(other.frameId()) - , fReportedAlpha(other.fReportedAlpha) - {} protected: SkEncodedInfo::Alpha onReportedAlpha() const override { |