From 36b4f0669c5ef40bb4ac17153e9442e6570600cc Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Mon, 16 Nov 2015 15:27:28 -0800 Subject: [PATCH] Make sky_shell.mojo work on Android There's no vsync service in MojoShell, so we shouldn't try to connect to it. Feature request for MojoShell is in https://github.com/domokit/mojo/issues/535. --- sky/shell/ui/engine.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sky/shell/ui/engine.cc b/sky/shell/ui/engine.cc index 96c28b4de46..ed96a3c54ca 100644 --- a/sky/shell/ui/engine.cc +++ b/sky/shell/ui/engine.cc @@ -124,10 +124,12 @@ void Engine::SetServices(ServicesDataPtr services) { services_ = services.Pass(); #if defined(OS_ANDROID) || defined(OS_IOS) - // TODO(abarth): Implement VSyncProvider on other platforms. - vsync::VSyncProviderPtr vsync_provider; - mojo::ConnectToService(services_->services_provided_by_embedder.get(), &vsync_provider); - animator_->set_vsync_provider(vsync_provider.Pass()); + if (services_->services_provided_by_embedder) { + // TODO(abarth): Implement VSyncProvider on other platforms. + vsync::VSyncProviderPtr vsync_provider; + mojo::ConnectToService(services_->services_provided_by_embedder.get(), &vsync_provider); + animator_->set_vsync_provider(vsync_provider.Pass()); + } #endif }