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

Made Picture::toImage happen on the IO thread with no need for an onscreen surface. #9813

Merged
gaaclarke merged 10 commits into from
Jul 16, 2019
Merged

Made Picture::toImage happen on the IO thread with no need for an onscreen surface. #9813

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4a43442
Made Picture::toImage happen on the IO thread with no need for a
gaaclarke Jul 12, 2019
cfa2f79
Removed more references to snapshot_delegate.h
gaaclarke Jul 12, 2019
38ca94d
Updated formatting of comments.
gaaclarke Jul 12, 2019
cebfbfd
Added docstring to MakeRasterImage.
gaaclarke Jul 15, 2019
4063f54
Added clarification comment.
gaaclarke Jul 15, 2019
1cf6dd8
Added golden image test.
gaaclarke Jul 15, 2019
ca8776e
Removed RunNowOrPostTask.
gaaclarke Jul 15, 2019
3e3e711
Removed explicit colorspace.
gaaclarke Jul 15, 2019
b3678f9
Revert "Removed explicit colorspace."
gaaclarke Jul 15, 2019
651e55c
Revert "Removed RunNowOrPostTask."
gaaclarke Jul 15, 2019
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
Prev Previous commit
Next Next commit
Updated formatting of comments.
  • Loading branch information
@gaaclarke
gaaclarke committed Jul 12, 2019
commit 38ca94dfd06dc4749699d68da9bb3cd6a18ddf81
22 changes: 11 additions & 11 deletions runtime/dart_isolate.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,17 @@ std::weak_ptr<DartIsolate> DartIsolate::CreateRootIsolate(
// being prepared to run.
auto root_embedder_data = std::make_unique<std::shared_ptr<DartIsolate>>(
std::make_shared<DartIsolate>(
settings, // settings
std::move(isolate_snapshot), // isolate snapshot
std::move(shared_snapshot), // shared snapshot
task_runners, // task runners
std::move(io_manager), // IO manager
std::move(image_decoder), // Image Decoder
advisory_script_uri, // advisory URI
advisory_script_entrypoint, // advisory entrypoint
nullptr, // child isolate preparer
isolate_create_callback, // isolate create callback
isolate_shutdown_callback // isolate shutdown callback
settings, // settings
std::move(isolate_snapshot), // isolate snapshot
std::move(shared_snapshot), // shared snapshot
task_runners, // task runners
std::move(io_manager), // IO manager
std::move(image_decoder), // Image Decoder
advisory_script_uri, // advisory URI
advisory_script_entrypoint, // advisory entrypoint
nullptr, // child isolate preparer
isolate_create_callback, // isolate create callback
isolate_shutdown_callback // isolate shutdown callback
));

std::tie(vm_isolate, embedder_isolate) = CreateDartVMAndEmbedderObjectPair(
Expand Down
30 changes: 15 additions & 15 deletions shell/common/shell.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@ std::unique_ptr<Shell> Shell::CreateShellOnPlatformThread(
std::unique_ptr<Engine> engine;
fml::TaskRunner::RunNowOrPostTask(
shell->GetTaskRunners().GetUITaskRunner(),
fml::MakeCopyable([&ui_latch, //
&engine, //
shell = shell.get(), //
isolate_snapshot = std::move(isolate_snapshot), //
shared_snapshot = std::move(shared_snapshot), //
vsync_waiter = std::move(vsync_waiter), //
io_manager = io_manager->GetWeakPtr() //
fml::MakeCopyable([&ui_latch, //
&engine, //
shell = shell.get(), //
isolate_snapshot = std::move(isolate_snapshot), //
shared_snapshot = std::move(shared_snapshot), //
vsync_waiter = std::move(vsync_waiter), //
io_manager = io_manager->GetWeakPtr() //
]() mutable {
TRACE_EVENT0("flutter", "ShellSetupUISubsystem");
const auto& task_runners = shell->GetTaskRunners();
Expand All @@ -124,14 +124,14 @@ std::unique_ptr<Shell> Shell::CreateShellOnPlatformThread(
auto animator = std::make_unique<Animator>(*shell, task_runners,
std::move(vsync_waiter));

engine = std::make_unique<Engine>(*shell, //
*shell->GetDartVM(), //
std::move(isolate_snapshot), //
std::move(shared_snapshot), //
task_runners, //
shell->GetSettings(), //
std::move(animator), //
std::move(io_manager) //
engine = std::make_unique<Engine>(*shell, //
*shell->GetDartVM(), //
std::move(isolate_snapshot), //
std::move(shared_snapshot), //
task_runners, //
shell->GetSettings(), //
std::move(animator), //
std::move(io_manager) //
);
ui_latch.Signal();
}));
Expand Down