From 4e24d05320f0158958676cb1e7fd77d150274ef8 Mon Sep 17 00:00:00 2001
From: Adam Barth <abarth@chromium.org>
Date: Tue, 20 Oct 2020 11:37:38 -0700
Subject: [PATCH] [fuchsia] zx::vmar::map migration

The new map() method receives its arguments in the same order as the
underlying C system call. This patch should not change any behavior.
---
 shell/platform/fuchsia/flutter/component.cc                 | 2 +-
 shell/platform/fuchsia/flutter/runner.cc                    | 6 +++---
 .../platform/fuchsia/runtime/dart/utils/mapped_resource.cc  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/shell/platform/fuchsia/flutter/component.cc b/shell/platform/fuchsia/flutter/component.cc
index 40f193be13ea6..8544031f162f9 100644
--- a/shell/platform/fuchsia/flutter/component.cc
+++ b/shell/platform/fuchsia/flutter/component.cc
@@ -481,7 +481,7 @@ class FileInNamespaceBuffer final : public fml::Mapping {
     }
     uintptr_t addr;
     zx_status_t status =
-        zx::vmar::root_self()->map(0, buffer.vmo, 0, buffer.size, flags, &addr);
+        zx::vmar::root_self()->map(flags, 0, buffer.vmo, 0, buffer.size, &addr);
     if (status != ZX_OK) {
       FML_LOG(FATAL) << "Failed to map " << path << ": "
                      << zx_status_get_string(status);
diff --git a/shell/platform/fuchsia/flutter/runner.cc b/shell/platform/fuchsia/flutter/runner.cc
index 1e8e26dfbfdeb..43b7da3e3db0a 100644
--- a/shell/platform/fuchsia/flutter/runner.cc
+++ b/shell/platform/fuchsia/flutter/runner.cc
@@ -45,9 +45,9 @@ uintptr_t GetICUData(const fuchsia::mem::Buffer& icu_data) {
     return 0u;
 
   uintptr_t data = 0u;
-  zx_status_t status = zx::vmar::root_self()->map(
-      0, icu_data.vmo, 0, static_cast<size_t>(data_size), ZX_VM_PERM_READ,
-      &data);
+  zx_status_t status =
+      zx::vmar::root_self()->map(ZX_VM_PERM_READ, 0, icu_data.vmo, 0,
+                                 static_cast<size_t>(data_size), &data);
   if (status == ZX_OK) {
     return data;
   }
diff --git a/shell/platform/fuchsia/runtime/dart/utils/mapped_resource.cc b/shell/platform/fuchsia/runtime/dart/utils/mapped_resource.cc
index a30afe538bb5d..9adba9308c545 100644
--- a/shell/platform/fuchsia/runtime/dart/utils/mapped_resource.cc
+++ b/shell/platform/fuchsia/runtime/dart/utils/mapped_resource.cc
@@ -82,8 +82,8 @@ bool MappedResource::LoadFromVmo(const std::string& path,
     flags |= ZX_VM_PERM_EXECUTE;
   }
   uintptr_t addr;
-  zx_status_t status = zx::vmar::root_self()->map(
-      0, resource_vmo.vmo, 0, resource_vmo.size, flags, &addr);
+  zx_status_t status = zx::vmar::root_self()->map(flags, 0, resource_vmo.vmo, 0,
+                                                  resource_vmo.size, &addr);
   if (status != ZX_OK) {
     FX_LOGF(ERROR, LOG_TAG, "Failed to map: %s", zx_status_get_string(status));
     return false;