diff --git a/sky/engine/platform/fonts/fuchsia/FontCacheFuchsia.cpp b/sky/engine/platform/fonts/fuchsia/FontCacheFuchsia.cpp index 95ce20d95d49f1e6ca848f42aaf991330451f5e9..bc12cf627d86bb557097308b1e19159c1a8d84d1 100644 --- a/sky/engine/platform/fonts/fuchsia/FontCacheFuchsia.cpp +++ b/sky/engine/platform/fonts/fuchsia/FontCacheFuchsia.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include @@ -59,7 +59,9 @@ fonts::FontSlant ToFontSlant(FontStyle style) { } void UnmapMemory(const void* buffer, void* context) { - mx::process::self().unmap_vm(reinterpret_cast(buffer), 0); + static_assert(sizeof(void*) == sizeof(uint64_t), "pointers aren't 64-bit"); + const uint64_t size = reinterpret_cast(context); + mx::vmar::root_self().unmap(reinterpret_cast(buffer), size); } sk_sp MakeSkDataFromVMO(const mx::vmo& vmo) { @@ -68,11 +70,11 @@ sk_sp MakeSkDataFromVMO(const mx::vmo& vmo) { if (status != NO_ERROR || size > std::numeric_limits::max()) return nullptr; uintptr_t buffer = 0; - mx::process::self().map_vm(vmo, 0, size, &buffer, MX_VM_FLAG_PERM_READ); + mx::vmar::root_self().map(0, vmo, 0, size, MX_VM_FLAG_PERM_READ, &buffer); if (status != NO_ERROR) return nullptr; return SkData::MakeWithProc(reinterpret_cast(buffer), size, - UnmapMemory, nullptr); + UnmapMemory, reinterpret_cast(size)); } fonts::FontProviderPtr* g_font_provider = nullptr;