| Index: src/core/SkAdvancedTypefaceMetrics.h
|
| diff --git a/src/core/SkAdvancedTypefaceMetrics.h b/src/core/SkAdvancedTypefaceMetrics.h
|
| index 026aec26f46ecf111af504469ac5d708cd1856f5..6dc1162c37f409a2cd3152c1d9840e977ce9cef2 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;
|
| };
|
|
|