| Index: ui/ozone/platform/drm/common/client_native_pixmap_dmabuf.h
|
| diff --git a/ui/ozone/platform/drm/common/client_native_pixmap_dmabuf.h b/ui/ozone/platform/drm/common/client_native_pixmap_dmabuf.h
|
| index 4fef3923c0076c04f21fde42feff8e86dd800217..98172352bb4c5034eca6f40dde0111c60105a95c 100644
|
| --- a/ui/ozone/platform/drm/common/client_native_pixmap_dmabuf.h
|
| +++ b/ui/ozone/platform/drm/common/client_native_pixmap_dmabuf.h
|
| @@ -12,32 +12,33 @@
|
| #include "base/files/scoped_file.h"
|
| #include "base/macros.h"
|
| #include "ui/gfx/geometry/size.h"
|
| +#include "ui/gfx/native_pixmap_handle.h"
|
| #include "ui/ozone/public/client_native_pixmap.h"
|
|
|
| namespace ui {
|
|
|
| class ClientNativePixmapDmaBuf : public ClientNativePixmap {
|
| public:
|
| - static std::unique_ptr<ClientNativePixmap>
|
| - ImportFromDmabuf(int dmabuf_fd, const gfx::Size& size, int stride);
|
| + static std::unique_ptr<ClientNativePixmap> ImportFromDmabuf(
|
| + const gfx::NativePixmapHandle& handle,
|
| + const gfx::Size& size);
|
|
|
| ~ClientNativePixmapDmaBuf() override;
|
|
|
| // Overridden from ClientNativePixmap.
|
| - void* Map() override;
|
| + bool Map() override;
|
| void Unmap() override;
|
| - void GetStride(int* stride) const override;
|
| +
|
| + void* GetMemoryAddress(size_t plane) const override;
|
| + int GetStride(size_t plane) const override;
|
|
|
| private:
|
| - ClientNativePixmapDmaBuf(int dmabuf_fd,
|
| - const gfx::Size& size,
|
| - int stride,
|
| - size_t map_size);
|
| + ClientNativePixmapDmaBuf(const gfx::NativePixmapHandle& handle,
|
| + const gfx::Size& size);
|
|
|
| - base::ScopedFD dmabuf_fd_;
|
| - const size_t map_size_;
|
| + const gfx::NativePixmapHandle pixmap_handle_;
|
| const gfx::Size size_;
|
| - const int stride_;
|
| + base::ScopedFD dmabuf_fd_;
|
| void* data_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ClientNativePixmapDmaBuf);
|
|
|