chromium/src
0
Fork 0
Code Activity

[fuchsia] prepare for api level 20

Browse Source 
This allows building with fuchsia_target_api_level = 20, but leaves
the level set to 18.

BUG: b/306258175
Change-Id: I9e60831de4ad3094e54857db0db04299b0ff8e63
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5583592
Reviewed-by: Zijie He <zijiehe@google.com>
Reviewed-by: Wez <wez@chromium.org>
Commit-Queue: Dustin Green <dustingreen@google.com>
Cr-Commit-Position: refs/heads/main@{#1308228}
This commit is contained in:
Dustin Green
2024-05-30 20:04:12 +00:00
committed by Chromium LUCI CQ
parent c7a3555ec2
commit ca2a069c6f
2 changed files with 5 additions and 5 deletions
fuchsia_web
webengine
browser
content_directory_browsertest.cc
webinstance_host
web_instance_host.cc

2
fuchsia_web/webengine/browser/content_directory_browsertest.cc

@ -41,7 +41,7 @@ void AddFileToPseudoDir(std::string_view data,
auto vmo_file = std::make_unique<vfs::VmoFile>(
std::move(contents_vmo), data.size(),
vfs::VmoFile::WriteOption::READ_ONLY, vfs::VmoFile::Sharing::CLONE_COW);
vfs::VmoFile::WriteMode::kReadOnly, vfs::VmoFile::DefaultSharingMode::kCloneCow);
status = dir->AddEntry(path.value(), std::move(vmo_file));
ASSERT_EQ(status, ZX_OK);
}

8
fuchsia_web/webinstance_host/web_instance_host.cc

@ -214,7 +214,7 @@ class InstanceBuilder {
// be offered statically to the `web_instances` collection.
void ServeOptionalDirectory(
OptionalDirectory directory,
std::unique_ptr<vfs::internal::Directory> fs_directory,
std::unique_ptr<vfs::Node> fs_directory,
fuchsia::io::Operations rights);
// Offers the directory `directory` from `void`.
@ -223,7 +223,7 @@ class InstanceBuilder {
// Serves the directory `name` as `offer` in the instance's subtree as a
// read-only or a read-write (if `writeable`) directory.
void ServeDirectory(std::string_view name,
std::unique_ptr<vfs::internal::Directory> fs_directory,
std::unique_ptr<vfs::Node> fs_directory,
fuchsia::io::Operations rights);
const raw_ref<sys::OutgoingDirectory> outgoing_directory_;
@ -466,7 +466,7 @@ std::string_view InstanceBuilder::GetDirectoryName(
void InstanceBuilder::ServeOptionalDirectory(
OptionalDirectory directory,
std::unique_ptr<vfs::internal::Directory> fs_directory,
std::unique_ptr<vfs::Node> fs_directory,
fuchsia::io::Operations rights) {
DCHECK(instance_dir_);
DCHECK(!is_directory_served(directory));
@ -491,7 +491,7 @@ void InstanceBuilder::OfferOptionalDirectoryFromVoid(
void InstanceBuilder::ServeDirectory(
std::string_view name,
std::unique_ptr<vfs::internal::Directory> fs_directory,
std::unique_ptr<vfs::Node> fs_directory,
fuchsia::io::Operations rights) {
DCHECK(instance_dir_);
zx_status_t status =