SkBitmap move

src/core/SkBitmap.cpp

 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkAtomics.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
@@ skipping 21 matching lines @@
     sk_bzero(this, sizeof(*this));
 }
 
 SkBitmap::SkBitmap(const SkBitmap& src) {
     SkDEBUGCODE(src.validate();)
     sk_bzero(this, sizeof(*this));
     *this = src;
     SkDEBUGCODE(this->validate();)
 }
 
+SkBitmap::SkBitmap(SkBitmap&& other) {
+    if (this != &other) {
+        memcpy(this, &other, sizeof(other));

[mtklein, 2015/12/10 23:09:58]

Can't this just be this->swap(other)?

[hal.canary, 2015/12/14 17:30:37]

Done.  need to initialize all variables first.

+        sk_bzero(&other, sizeof(other));
+    }        
+}
+
 SkBitmap::~SkBitmap() {
     SkDEBUGCODE(this->validate();)
     this->freePixels();
 }
 
 SkBitmap& SkBitmap::operator=(const SkBitmap& src) {
     if (this != &src) {
         this->freePixels();
         memcpy(this, &src, sizeof(src));
 
@@ skipping 13 matching lines @@
             // setPixels.
             // Just leave the memcpy'ed one but they'll get out of sync
             // as soon either is modified.
         }
     }
 
     SkDEBUGCODE(this->validate();)
     return *this;
 }
 
+SkBitmap& SkBitmap::operator=(SkBitmap&& other) {
+    if (this != &other) {
+        this->swap(other);
+        other.reset();
+    }
+    return *this;
+}
+
 void SkBitmap::swap(SkBitmap& other) {
     SkTSwap(fColorTable, other.fColorTable);
     SkTSwap(fPixelRef, other.fPixelRef);
     SkTSwap(fPixelRefOrigin, other.fPixelRefOrigin);
     SkTSwap(fPixelLockCount, other.fPixelLockCount);
     SkTSwap(fPixels, other.fPixels);
     SkTSwap(fInfo, other.fInfo);
     SkTSwap(fRowBytes, other.fRowBytes);
     SkTSwap(fFlags, other.fFlags);
 
@@ skipping 1243 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef SK_DEBUG
 void SkImageInfo::validate() const {
     SkASSERT(fWidth >= 0);
     SkASSERT(fHeight >= 0);
     SkASSERT(SkColorTypeIsValid(fColorType));
     SkASSERT(SkAlphaTypeIsValid(fAlphaType));
 }
 #endif