Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(889)

Side by Side Diff: ui/ozone/platform/drm/common/client_native_pixmap_dmabuf.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_OZONE_PLATFORM_DRM_COMMON_CLIENT_NATIVE_PIXMAP_DMABUF_H_ 5 #ifndef UI_OZONE_PLATFORM_DRM_COMMON_CLIENT_NATIVE_PIXMAP_DMABUF_H_
6 #define UI_OZONE_PLATFORM_DRM_COMMON_CLIENT_NATIVE_PIXMAP_DMABUF_H_ 6 #define UI_OZONE_PLATFORM_DRM_COMMON_CLIENT_NATIVE_PIXMAP_DMABUF_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory>
11
10 #include "base/files/scoped_file.h" 12 #include "base/files/scoped_file.h"
11 #include "base/macros.h" 13 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "ui/gfx/geometry/size.h" 14 #include "ui/gfx/geometry/size.h"
14 #include "ui/ozone/public/client_native_pixmap.h" 15 #include "ui/ozone/public/client_native_pixmap.h"
15 16
16 namespace ui { 17 namespace ui {
17 18
18 class ClientNativePixmapDmaBuf : public ClientNativePixmap { 19 class ClientNativePixmapDmaBuf : public ClientNativePixmap {
19 public: 20 public:
20 static scoped_ptr<ClientNativePixmap> ImportFromDmabuf(int dmabuf_fd, 21 static std::unique_ptr<ClientNativePixmap>
21 const gfx::Size& size, 22 ImportFromDmabuf(int dmabuf_fd, const gfx::Size& size, int stride);
22 int stride);
23 23
24 ~ClientNativePixmapDmaBuf() override; 24 ~ClientNativePixmapDmaBuf() override;
25 25
26 // Overridden from ClientNativePixmap. 26 // Overridden from ClientNativePixmap.
27 void* Map() override; 27 void* Map() override;
28 void Unmap() override; 28 void Unmap() override;
29 void GetStride(int* stride) const override; 29 void GetStride(int* stride) const override;
30 30
31 private: 31 private:
32 ClientNativePixmapDmaBuf(int dmabuf_fd, const gfx::Size& size, int stride); 32 ClientNativePixmapDmaBuf(int dmabuf_fd, const gfx::Size& size, int stride);
33 33
34 base::ScopedFD dmabuf_fd_; 34 base::ScopedFD dmabuf_fd_;
35 const gfx::Size size_; 35 const gfx::Size size_;
36 const int stride_; 36 const int stride_;
37 void* data_; 37 void* data_;
38 38
39 DISALLOW_COPY_AND_ASSIGN(ClientNativePixmapDmaBuf); 39 DISALLOW_COPY_AND_ASSIGN(ClientNativePixmapDmaBuf);
40 }; 40 };
41 41
42 } // namespace ui 42 } // namespace ui
43 43
44 #endif // UI_OZONE_PLATFORM_DRM_COMMON_CLIENT_NATIVE_PIXMAP_DMABUF_H_ 44 #endif // UI_OZONE_PLATFORM_DRM_COMMON_CLIENT_NATIVE_PIXMAP_DMABUF_H_
OLDNEW
« no previous file with comments | « ui/ozone/platform/drm/client_native_pixmap_factory_gbm.cc ('k') | ui/ozone/platform/drm/common/client_native_pixmap_dmabuf.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698