Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ void DartTestComponentController::SetUp() {
suite_context_ = sys::ComponentContext::Create();
suite_context_->outgoing()->AddPublicService(this->GetHandler());
suite_context_->outgoing()->Serve(
start_info_.mutable_outgoing_dir()->TakeChannel(), loop_->dispatcher());
std::move(*start_info_.mutable_outgoing_dir()), loop_->dispatcher());

loop_->Run();
}
Expand Down
8 changes: 4 additions & 4 deletions shell/platform/fuchsia/flutter/component_v1.cc
Original file line number Diff line number Diff line change
Expand Up @@ -159,16 +159,16 @@ ComponentV1::ComponentV1(
continue;
}

zx::channel dir;
fidl::InterfaceHandle<fuchsia::io::Directory> dir;
if (path == kServiceRootPath) {
svc_ = std::make_unique<sys::ServiceDirectory>(
std::move(startup_info.flat_namespace.directories.at(i)));
dir = svc_->CloneChannel().TakeChannel();
dir = svc_->CloneChannel();
} else {
dir = std::move(startup_info.flat_namespace.directories.at(i));
}

zx_handle_t dir_handle = dir.release();
zx_handle_t dir_handle = dir.TakeChannel().release();
if (fdio_ns_bind(fdio_ns_.get(), path.data(), dir_handle) != ZX_OK) {
FML_LOG(ERROR) << "Could not bind path to namespace: " << path;
zx_handle_close(dir_handle);
Expand Down Expand Up @@ -199,7 +199,7 @@ ComponentV1::ComponentV1(
outgoing_dir_->Serve(fuchsia::io::OpenFlags::RIGHT_READABLE |
fuchsia::io::OpenFlags::RIGHT_WRITABLE |
fuchsia::io::OpenFlags::DIRECTORY,
std::move(launch_info.directory_request));
launch_info.directory_request.TakeChannel());
}

directory_request_ = directory_ptr_.NewRequest();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ class TestResponseListenerServer
return match;
}

// KeyboardInputListener override
void ReportReady(ReportReadyCallback) override {}

private:
// Not owned.
async_dispatcher_t* dispatcher_ = nullptr;
Expand Down
2 changes: 1 addition & 1 deletion tools/fuchsia/target_api_level
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10