Add SkiaSurface::swapBitmap()

src/she/skia/skia_surface.h

@@ -76,7 +76,7 @@ public:
     SkRect dstRect = SkRect::Make(SkIRect::MakeXYWH(0, 0, result.width(), result.height()));
     canvas.drawBitmapRectToRect(m_bitmap, &srcRect, dstRect);
 
-    m_bitmap.swap(result);
+    swapBitmap(result);
   }
 
   void* nativeHandle() override {
@@ -204,6 +204,10 @@ public:
     return m_bitmap;
   }
 
+  void swapBitmap(SkBitmap& other) {
+    m_bitmap.swap(other);
+  }
+
 private:
   SkBitmap m_bitmap;
 };

src/she/skia/skia_system.h

@@ -72,7 +72,7 @@ public:
         bm.pixelRef()->setURI(filename);
 
         SkiaSurface* sur = new SkiaSurface();
-        sur->bitmap().swap(bm);
+        sur->swapBitmap(bm);
         return sur;
       }
     }