diff options
author | halcanary <halcanary@google.com> | 2016-08-08 07:21:42 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-08-08 07:21:42 -0700 |
commit | 9be372041ec331f1b04c99890f92d24c59bf9dad (patch) | |
tree | 6b60c1fb924483f633b59dfbc4b7673bafc803e4 /src/core/SkAdvancedTypefaceMetrics.h | |
parent | 5d2befe0062c7c8dfc8760d3b3c02846988e9a4e (diff) |
std::move(SkTDArray)
Since we don't support MSVC2013 anymore, we can be more
succinct when defining move constructors of compound types.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2227673002
Review-Url: https://codereview.chromium.org/2227673002
Diffstat (limited to 'src/core/SkAdvancedTypefaceMetrics.h')
-rw-r--r-- | src/core/SkAdvancedTypefaceMetrics.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/core/SkAdvancedTypefaceMetrics.h b/src/core/SkAdvancedTypefaceMetrics.h index 026aec26f4..6dc1162c37 100644 --- a/src/core/SkAdvancedTypefaceMetrics.h +++ b/src/core/SkAdvancedTypefaceMetrics.h @@ -120,19 +120,8 @@ public: uint16_t fEndId; SkTDArray<Data> fAdvance; AdvanceMetric(uint16_t startId) : fStartId(startId) {} - AdvanceMetric(AdvanceMetric&& other) - : fType(other.fType) - , fStartId(other.fStartId) - , fEndId(other.fEndId) { - fAdvance.swap(other.fAdvance); - } - AdvanceMetric& operator=(AdvanceMetric&& other) { - fType = other.fType; - fStartId = other.fStartId; - fEndId = other.fEndId; - fAdvance.swap(other.fAdvance); - return *this; - } + AdvanceMetric(AdvanceMetric&& other) = default; + AdvanceMetric& operator=(AdvanceMetric&& other) = default; AdvanceMetric(const AdvanceMetric&) = delete; AdvanceMetric& operator=(const AdvanceMetric&) = delete; }; |