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

Unified Diff: components/exo/wayland/server.cc

Issue 2843113002: make base::SharedMemoryHandle a class on POSIX. (Closed)
Patch Set: Fix test error. Created 3 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 side-by-side diff with in-line comments
Download patch
Index: components/exo/wayland/server.cc
diff --git a/components/exo/wayland/server.cc b/components/exo/wayland/server.cc
index 0d27ff60d55be550aef2945f2011f1ee3685a9be..5b718c3c726411bd4d312c12d1ae118378c1112b 100644
--- a/components/exo/wayland/server.cc
+++ b/components/exo/wayland/server.cc
@@ -443,7 +443,7 @@ void shm_create_pool(wl_client* client,
int32_t size) {
std::unique_ptr<SharedMemory> shared_memory =
GetUserDataAs<Display>(resource)->CreateSharedMemory(
- base::FileDescriptor(fd, true), size);
+ base::SharedMemoryHandle::ImportHandle(fd), size);
if (!shared_memory) {
wl_resource_post_no_memory(resource);
return;
@@ -2749,7 +2749,7 @@ class WaylandKeyboardDelegate : public KeyboardDelegate {
memcpy(shared_keymap.memory(), keymap_string.get(), keymap_size);
wl_keyboard_send_keymap(keyboard_resource_,
WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
- shared_keymap.handle().fd, keymap_size);
+ shared_keymap.handle().GetHandle(), keymap_size);
}
// Overridden from KeyboardDelegate:

Powered by Google App Engine
This is Rietveld 408576698