Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Reference canonical fuchsia.io constants #32336

Merged
akbiggs merged 1 commit into from
Mar 31, 2022
Merged

Reference canonical fuchsia.io constants #32336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions shell/platform/fuchsia/flutter/component_v1.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,9 @@ ComponentV1::ComponentV1(

// LaunchInfo::service_request optional.
if (launch_info.directory_request) {
outgoing_dir_->Serve(fuchsia::io::OPEN_RIGHT_READABLE |
fuchsia::io::OPEN_RIGHT_WRITABLE |
fuchsia::io::OPEN_FLAG_DIRECTORY,
outgoing_dir_->Serve(fuchsia::io::OpenFlags::RIGHT_READABLE |
fuchsia::io::OpenFlags::RIGHT_WRITABLE |
fuchsia::io::OpenFlags::DIRECTORY,
std::move(launch_info.directory_request));
}

Expand All @@ -216,9 +216,9 @@ ComponentV1::ComponentV1(
composed_service_dir->set_fallback(std::move(flutter_public_dir));

// Clone and check if client is servicing the directory.
directory_ptr_->Clone(fuchsia::io::OPEN_FLAG_DESCRIBE |
fuchsia::io::OPEN_RIGHT_READABLE |
fuchsia::io::OPEN_RIGHT_WRITABLE,
directory_ptr_->Clone(fuchsia::io::OpenFlags::DESCRIBE |
fuchsia::io::OpenFlags::RIGHT_READABLE |
fuchsia::io::OpenFlags::RIGHT_WRITABLE,
cloned_directory_ptr_.NewRequest());

cloned_directory_ptr_.events().OnOpen =
Expand Down
18 changes: 9 additions & 9 deletions shell/platform/fuchsia/flutter/component_v2.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,17 +238,17 @@ ComponentV2::ComponentV2(

// ComponentStartInfo::runtime_dir (optional).
if (start_info.has_runtime_dir()) {
runtime_dir_->Serve(fuchsia::io::OPEN_RIGHT_READABLE |
fuchsia::io::OPEN_RIGHT_WRITABLE |
fuchsia::io::OPEN_FLAG_DIRECTORY,
runtime_dir_->Serve(fuchsia::io::OpenFlags::RIGHT_READABLE |
fuchsia::io::OpenFlags::RIGHT_WRITABLE |
fuchsia::io::OpenFlags::DIRECTORY,
start_info.mutable_runtime_dir()->TakeChannel());
}

// ComponentStartInfo::outgoing_dir (optional).
if (start_info.has_outgoing_dir()) {
outgoing_dir_->Serve(fuchsia::io::OPEN_RIGHT_READABLE |
fuchsia::io::OPEN_RIGHT_WRITABLE |
fuchsia::io::OPEN_FLAG_DIRECTORY,
outgoing_dir_->Serve(fuchsia::io::OpenFlags::RIGHT_READABLE |
fuchsia::io::OpenFlags::RIGHT_WRITABLE |
fuchsia::io::OpenFlags::DIRECTORY,
start_info.mutable_outgoing_dir()->TakeChannel());
}

Expand All @@ -266,9 +266,9 @@ ComponentV2::ComponentV2(
composed_service_dir->set_fallback(std::move(flutter_public_dir));

// Clone and check if client is servicing the directory.
directory_ptr_->Clone(fuchsia::io::OPEN_FLAG_DESCRIBE |
fuchsia::io::OPEN_RIGHT_READABLE |
fuchsia::io::OPEN_RIGHT_WRITABLE,
directory_ptr_->Clone(fuchsia::io::OpenFlags::DESCRIBE |
fuchsia::io::OpenFlags::RIGHT_READABLE |
fuchsia::io::OpenFlags::RIGHT_WRITABLE,
cloned_directory_ptr_.NewRequest());

// Collect our standard set of directories along with directories that are
Expand Down
4 changes: 2 additions & 2 deletions shell/platform/fuchsia/flutter/file_in_namespace_buffer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ std::unique_ptr<fml::Mapping> LoadFile(int namespace_fd,

std::unique_ptr<fml::FileMapping> MakeFileMapping(const char* path,
bool executable) {
auto flags = fuchsia::io::OPEN_RIGHT_READABLE;
auto flags = fuchsia::io::OpenFlags::RIGHT_READABLE;
if (executable) {
flags |= fuchsia::io::OPEN_RIGHT_EXECUTABLE;
flags |= fuchsia::io::OpenFlags::RIGHT_EXECUTABLE;
}

// The returned file descriptor is compatible with standard posix operations
Expand Down
14 changes: 7 additions & 7 deletions shell/platform/fuchsia/runtime/dart/utils/mapped_resource.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,17 +109,17 @@ static int OpenFdExec(const std::string& path, int dirfd) {
// fdio_open_fd_at does not support AT_FDCWD, by design. Use fdio_open_fd
// and expect an absolute path for that usage pattern.
dart_utils::Check(path[0] == '/', LOG_TAG);
result =
fdio_open_fd(path.c_str(),
static_cast<uint32_t>(fuchsia::io::OPEN_RIGHT_READABLE |
fuchsia::io::OPEN_RIGHT_EXECUTABLE),
&fd);
result = fdio_open_fd(
path.c_str(),
static_cast<uint32_t>(fuchsia::io::OpenFlags::RIGHT_READABLE |
fuchsia::io::OpenFlags::RIGHT_EXECUTABLE),
&fd);
} else {
dart_utils::Check(path[0] != '/', LOG_TAG);
result = fdio_open_fd_at(
dirfd, path.c_str(),
static_cast<uint32_t>(fuchsia::io::OPEN_RIGHT_READABLE |
fuchsia::io::OPEN_RIGHT_EXECUTABLE),
static_cast<uint32_t>(fuchsia::io::OpenFlags::RIGHT_READABLE |
fuchsia::io::OpenFlags::RIGHT_EXECUTABLE),
&fd);
}
if (result != ZX_OK) {
Expand Down
8 changes: 4 additions & 4 deletions shell/platform/fuchsia/runtime/dart/utils/vmo.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ bool VmoFromFilename(const std::string& filename,
// Note: the implementation here cannot be shared with VmoFromFilenameAt
// because fdio_open_fd_at does not aim to provide POSIX compatibility, and
// thus does not handle AT_FDCWD as dirfd.
auto flags = fuchsia::io::OPEN_RIGHT_READABLE;
auto flags = fuchsia::io::OpenFlags::RIGHT_READABLE;
if (executable) {
flags |= fuchsia::io::OPEN_RIGHT_EXECUTABLE;
flags |= fuchsia::io::OpenFlags::RIGHT_EXECUTABLE;
}

int fd;
Expand All @@ -81,9 +81,9 @@ bool VmoFromFilenameAt(int dirfd,
const std::string& filename,
bool executable,
fuchsia::mem::Buffer* buffer) {
auto flags = fuchsia::io::OPEN_RIGHT_READABLE;
auto flags = fuchsia::io::OpenFlags::RIGHT_READABLE;
if (executable) {
flags |= fuchsia::io::OPEN_RIGHT_EXECUTABLE;
flags |= fuchsia::io::OpenFlags::RIGHT_EXECUTABLE;
}

int fd;
Expand Down