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

Unified Diff: ui/gfx/mojo/buffer_types_traits.cc

Issue 2694923003: Rename buffer_types_traits.{cc,h} to match normal conventions. (Closed)
Patch Set: Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/mojo/buffer_types_traits.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/mojo/buffer_types_traits.cc
diff --git a/ui/gfx/mojo/buffer_types_traits.cc b/ui/gfx/mojo/buffer_types_traits.cc
deleted file mode 100644
index 540326fc7250479c639cbacfa9ea7b2ca8630134..0000000000000000000000000000000000000000
--- a/ui/gfx/mojo/buffer_types_traits.cc
+++ /dev/null
@@ -1,166 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/gfx/mojo/buffer_types_traits.h"
-
-#include "mojo/public/cpp/system/platform_handle.h"
-
-namespace mojo {
-
-void* StructTraits<gfx::mojom::NativePixmapHandleDataView,
- gfx::NativePixmapHandle>::
- SetUpContext(const gfx::NativePixmapHandle& pixmap_handle) {
- return new PixmapHandleFdList();
-}
-
-void StructTraits<gfx::mojom::NativePixmapHandleDataView,
- gfx::NativePixmapHandle>::
- TearDownContext(const gfx::NativePixmapHandle& handle, void* context) {
- delete static_cast<PixmapHandleFdList*>(context);
-}
-
-std::vector<mojo::ScopedHandle> StructTraits<
- gfx::mojom::NativePixmapHandleDataView,
- gfx::NativePixmapHandle>::fds(const gfx::NativePixmapHandle& pixmap_handle,
- void* context) {
- PixmapHandleFdList* handles = static_cast<PixmapHandleFdList*>(context);
-#if defined(USE_OZONE)
- if (handles->empty()) {
- // Generate the handles here, but do not send them yet.
- for (const base::FileDescriptor& fd : pixmap_handle.fds) {
- base::PlatformFile platform_file = fd.fd;
- handles->push_back(mojo::WrapPlatformFile(platform_file));
- }
- return PixmapHandleFdList(handles->size());
- }
-#endif // defined(USE_OZONE)
- return std::move(*handles);
-}
-
-bool StructTraits<
- gfx::mojom::NativePixmapHandleDataView,
- gfx::NativePixmapHandle>::Read(gfx::mojom::NativePixmapHandleDataView data,
- gfx::NativePixmapHandle* out) {
-#if defined(USE_OZONE)
- mojo::ArrayDataView<mojo::ScopedHandle> handles_data_view;
- data.GetFdsDataView(&handles_data_view);
- for (size_t i = 0; i < handles_data_view.size(); ++i) {
- mojo::ScopedHandle handle = handles_data_view.Take(i);
- base::PlatformFile platform_file;
- if (mojo::UnwrapPlatformFile(std::move(handle), &platform_file) !=
- MOJO_RESULT_OK)
- return false;
- constexpr bool auto_close = true;
- out->fds.push_back(base::FileDescriptor(platform_file, auto_close));
- }
- return data.ReadPlanes(&out->planes);
-#else
- return false;
-#endif
-}
-
-mojo::ScopedHandle StructTraits<gfx::mojom::GpuMemoryBufferHandleDataView,
- gfx::GpuMemoryBufferHandle>::
- shared_memory_handle(const gfx::GpuMemoryBufferHandle& handle) {
- if (handle.type != gfx::SHARED_MEMORY_BUFFER)
- return mojo::ScopedHandle();
-#if defined(OS_MACOSX)
- base::SharedMemoryHandle shm_handle = handle.handle;
- size_t num_bytes = 0;
- if (!shm_handle.GetSize(&num_bytes))
- return mojo::ScopedHandle();
- mojo::ScopedSharedBufferHandle scoped_handle =
- mojo::WrapSharedMemoryHandle(shm_handle, num_bytes, false);
- mojo::Handle mojo_handle = scoped_handle.release();
- return mojo::MakeScopedHandle(mojo_handle);
-#else // defined(OS_MACOSX)
- base::PlatformFile platform_file = base::kInvalidPlatformFile;
-#if defined(OS_WIN)
- platform_file = handle.handle.GetHandle();
-#else
- platform_file = handle.handle.fd;
-#endif
- return mojo::WrapPlatformFile(platform_file);
-#endif // defined(OS_MACOSX)
-}
-
-const gfx::NativePixmapHandle&
-StructTraits<gfx::mojom::GpuMemoryBufferHandleDataView,
- gfx::GpuMemoryBufferHandle>::
- native_pixmap_handle(const gfx::GpuMemoryBufferHandle& handle) {
-#if defined(USE_OZONE)
- return handle.native_pixmap_handle;
-#else
- static gfx::NativePixmapHandle pixmap_handle;
- return pixmap_handle;
-#endif
-}
-
-mojo::ScopedHandle StructTraits<gfx::mojom::GpuMemoryBufferHandleDataView,
- gfx::GpuMemoryBufferHandle>::
- mach_port(const gfx::GpuMemoryBufferHandle& handle) {
-#if defined(OS_MACOSX) && !defined(OS_IOS)
- if (handle.type != gfx::IO_SURFACE_BUFFER)
- return mojo::ScopedHandle();
- return mojo::WrapMachPort(handle.mach_port.get());
-#else
- return mojo::ScopedHandle();
-#endif
-}
-
-bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDataView,
- gfx::GpuMemoryBufferHandle>::
- Read(gfx::mojom::GpuMemoryBufferHandleDataView data,
- gfx::GpuMemoryBufferHandle* out) {
- if (!data.ReadType(&out->type) || !data.ReadId(&out->id))
- return false;
-
- if (out->type == gfx::SHARED_MEMORY_BUFFER) {
- mojo::ScopedHandle handle = data.TakeSharedMemoryHandle();
- if (handle.is_valid()) {
-#if defined(OS_MACOSX)
- mojo::Handle mojo_handle = handle.release();
- mojo::ScopedSharedBufferHandle buffer_handle =
- mojo::MakeScopedHandle(mojo::SharedBufferHandle(mojo_handle.value()));
- MojoResult unwrap_result = mojo::UnwrapSharedMemoryHandle(
- std::move(buffer_handle), &out->handle, nullptr, nullptr);
- if (unwrap_result != MOJO_RESULT_OK)
- return false;
-#else // defined(OS_MACOSX)
- base::PlatformFile platform_file;
- MojoResult unwrap_result =
- mojo::UnwrapPlatformFile(std::move(handle), &platform_file);
- if (unwrap_result != MOJO_RESULT_OK)
- return false;
-#if defined(OS_WIN)
- out->handle =
- base::SharedMemoryHandle(platform_file, base::GetCurrentProcId());
-#else
- out->handle = base::SharedMemoryHandle(platform_file, true);
-#endif
-#endif // defined(OS_MACOSX)
- }
-
- out->offset = data.offset();
- out->stride = data.stride();
- }
-#if defined(USE_OZONE)
- if (out->type == gfx::OZONE_NATIVE_PIXMAP &&
- !data.ReadNativePixmapHandle(&out->native_pixmap_handle))
- return false;
-#endif
-#if defined(OS_MACOSX) && !defined(OS_IOS)
- if (out->type == gfx::IO_SURFACE_BUFFER) {
- mach_port_t mach_port;
- MojoResult unwrap_result =
- mojo::UnwrapMachPort(data.TakeMachPort(), &mach_port);
- if (unwrap_result != MOJO_RESULT_OK)
- return false;
- out->mach_port.reset(mach_port);
- }
-#endif
- return true;
-}
-
-} // namespace mojo
« no previous file with comments | « ui/gfx/mojo/buffer_types_traits.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698