diff options
| -rw-r--r-- | components/view_manager/gles2/command_buffer_driver.cc | 2 | ||||
| -rw-r--r-- | components/view_manager/public/interfaces/command_buffer.mojom | 3 | ||||
| -rw-r--r-- | mojo/gles2/command_buffer_client_impl.cc | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/components/view_manager/gles2/command_buffer_driver.cc b/components/view_manager/gles2/command_buffer_driver.cc index e31d8e3..53a428a 100644 --- a/components/view_manager/gles2/command_buffer_driver.cc +++ b/components/view_manager/gles2/command_buffer_driver.cc @@ -55,7 +55,7 @@ void CommandBufferDriver::Initialize( bool success = DoInitialize(shared_state.Pass()); mojo::GpuCapabilitiesPtr capabilities = success ? mojo::GpuCapabilities::From(decoder_->GetCapabilities()) - : mojo::GpuCapabilities::New(); + : nullptr; sync_client_->DidInitialize(success, capabilities.Pass()); } diff --git a/components/view_manager/public/interfaces/command_buffer.mojom b/components/view_manager/public/interfaces/command_buffer.mojom index 9a5bc39..b18965b 100644 --- a/components/view_manager/public/interfaces/command_buffer.mojom +++ b/components/view_manager/public/interfaces/command_buffer.mojom @@ -18,7 +18,8 @@ struct CommandBufferState { }; interface CommandBufferSyncClient { - DidInitialize(bool success, GpuCapabilities capabilities); + // |capabilities| is null if |success| is false. + DidInitialize(bool success, GpuCapabilities? capabilities); DidMakeProgress(CommandBufferState state); }; diff --git a/mojo/gles2/command_buffer_client_impl.cc b/mojo/gles2/command_buffer_client_impl.cc index fe374e9..61d6422 100644 --- a/mojo/gles2/command_buffer_client_impl.cc +++ b/mojo/gles2/command_buffer_client_impl.cc @@ -67,7 +67,9 @@ class CommandBufferClientImpl::SyncClientImpl } gpu::Capabilities GetCapabilities() { - return capabilities_.To<gpu::Capabilities>(); + if (capabilities_) + return capabilities_.To<gpu::Capabilities>(); + return gpu::Capabilities(); } private: |