| Index: webrtc/modules/desktop_capture/win/cursor.cc
|
| diff --git a/webrtc/modules/desktop_capture/win/cursor.cc b/webrtc/modules/desktop_capture/win/cursor.cc
|
| index a3acaf822bad1e889420e2e6e5448facad9438b6..304d5960d5ed7b3c450738ea31bf406b7cf23408 100644
|
| --- a/webrtc/modules/desktop_capture/win/cursor.cc
|
| +++ b/webrtc/modules/desktop_capture/win/cursor.cc
|
| @@ -11,8 +11,8 @@
|
| #include "webrtc/modules/desktop_capture/win/cursor.h"
|
|
|
| #include <algorithm>
|
| +#include <memory>
|
|
|
| -#include "webrtc/base/scoped_ptr.h"
|
| #include "webrtc/modules/desktop_capture/win/scoped_gdi_object.h"
|
| #include "webrtc/modules/desktop_capture/desktop_frame.h"
|
| #include "webrtc/modules/desktop_capture/desktop_geometry.h"
|
| @@ -135,7 +135,7 @@ MouseCursor* CreateMouseCursorFromHCursor(HDC dc, HCURSOR cursor) {
|
|
|
| int width = bitmap_info.bmWidth;
|
| int height = bitmap_info.bmHeight;
|
| - rtc::scoped_ptr<uint32_t[]> mask_data(new uint32_t[width * height]);
|
| + std::unique_ptr<uint32_t[]> mask_data(new uint32_t[width * height]);
|
|
|
| // Get pixel data from |scoped_mask| converting it to 32bpp along the way.
|
| // GetDIBits() sets the alpha component of every pixel to 0.
|
| @@ -162,7 +162,7 @@ MouseCursor* CreateMouseCursorFromHCursor(HDC dc, HCURSOR cursor) {
|
| }
|
|
|
| uint32_t* mask_plane = mask_data.get();
|
| - rtc::scoped_ptr<DesktopFrame> image(
|
| + std::unique_ptr<DesktopFrame> image(
|
| new BasicDesktopFrame(DesktopSize(width, height)));
|
| bool has_alpha = false;
|
|
|
|
|