Index: remoting/host/chromeos/skia_bitmap_desktop_frame.cc |
diff --git a/remoting/host/chromeos/skia_bitmap_desktop_frame.cc b/remoting/host/chromeos/skia_bitmap_desktop_frame.cc |
index 6711b2567f434b9489427f338d1a2b0a0af2cfe2..dfd9b108256a4f7ad0b992f7819f194ab392ba5f 100644 |
--- a/remoting/host/chromeos/skia_bitmap_desktop_frame.cc |
+++ b/remoting/host/chromeos/skia_bitmap_desktop_frame.cc |
@@ -2,10 +2,13 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+#include "remoting/host/chromeos/skia_bitmap_desktop_frame.h" |
+ |
#include <stddef.h> |
+#include <utility> |
+ |
#include "base/logging.h" |
-#include "remoting/host/chromeos/skia_bitmap_desktop_frame.h" |
namespace remoting { |
@@ -23,7 +26,7 @@ SkiaBitmapDesktopFrame* SkiaBitmapDesktopFrame::Create( |
const size_t row_bytes = bitmap->rowBytes(); |
SkiaBitmapDesktopFrame* result = new SkiaBitmapDesktopFrame( |
- size, row_bytes, bitmap_data, bitmap.Pass()); |
+ size, row_bytes, bitmap_data, std::move(bitmap)); |
return result; |
} |
@@ -32,10 +35,8 @@ SkiaBitmapDesktopFrame::SkiaBitmapDesktopFrame(webrtc::DesktopSize size, |
int stride, |
uint8_t* data, |
scoped_ptr<SkBitmap> bitmap) |
- : DesktopFrame(size, stride, data, nullptr), bitmap_(bitmap.Pass()) { |
-} |
+ : DesktopFrame(size, stride, data, nullptr), bitmap_(std::move(bitmap)) {} |
-SkiaBitmapDesktopFrame::~SkiaBitmapDesktopFrame() { |
-} |
+SkiaBitmapDesktopFrame::~SkiaBitmapDesktopFrame() {} |
} // namespace remoting |