提交 ad37a616 编写于 作者: I Ian Hickson

Merge pull request #2449 from Hixie/fix-crash

Fix startup crash caused by mojo roll.
......@@ -123,10 +123,7 @@ void Engine::SetServices(ServicesDataPtr services) {
mojo::ConnectToService(shell.get(), "mojo:vsync", &vsync_provider);
services_->shell = shell.Pass();
} else {
auto embedder_services = mojo::ServiceProviderPtr::Create(
services_->services_provided_by_embedder.Pass());
mojo::ConnectToService(embedder_services.get(), &vsync_provider);
services_->services_provided_by_embedder = embedder_services.Pass();
mojo::ConnectToService(services_provided_by_embedder_.get(), &vsync_provider);
}
animator_->Reset();
animator_->set_vsync_provider(vsync_provider.Pass());
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册