commit e8a986387b21bcfbc9224d2eae9480cbf5d87934
author Brian Osman <brianosman@google.com> Wed Apr 10 10:26:10 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Apr 10 15:06:20 2019 +0000
tree 3de6780183c038ce0585cbc761335878037f42e7
parent 9313aa77e129a2420d581e8f6c5de6b33a5c92e3

Define all ImageSetEntry members out of line

This fixes compile errors in Windows DLL builds, where (due to
exceptions?) any of these members might need to call sk_sp's
destructor.

Change-Id: I82986afa4497216cda76b681782ccea3c530ba7a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/207121
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/core/SkCanvas.cpp

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index bddffa4..0fddd6b 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -2849,6 +2849,11 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
+SkCanvas::ImageSetEntry::ImageSetEntry() = default;
+SkCanvas::ImageSetEntry::~ImageSetEntry() = default;
+SkCanvas::ImageSetEntry::ImageSetEntry(const ImageSetEntry&) = default;
+SkCanvas::ImageSetEntry& SkCanvas::ImageSetEntry::operator=(const ImageSetEntry&) = default;
+
 SkCanvas::ImageSetEntry::ImageSetEntry(sk_sp<const SkImage> image, const SkRect& srcRect,
                                        const SkRect& dstRect, int matrixIndex, float alpha,
                                        unsigned aaFlags, bool hasClip)