diff options
author | yzshen <yzshen@chromium.org> | 2015-08-21 14:42:12 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-21 21:42:50 +0000 |
commit | c51769c465523760fa84c13e94ebc6239c3e3428 (patch) | |
tree | 15d7224c3fa131f41a37006aa66179ca0f6779e8 /components/view_manager | |
parent | c6b5fd70092c79738374e891a37028b5565455a9 (diff) | |
download | chromium_src-c51769c465523760fa84c13e94ebc6239c3e3428.zip chromium_src-c51769c465523760fa84c13e94ebc6239c3e3428.tar.gz chromium_src-c51769c465523760fa84c13e94ebc6239c3e3428.tar.bz2 |
command_buffer.mojom: make CommandBufferSyncClient.DidInitialize() accept a nullable GpuCapabilities pointer.
Originally DidInitialize() requires a non-nullable GpuCapabilities
pointer whose struct members are also non-nullable. It is tedious and
unnecessary for callsites to fulfill this requirement on failure.
This CL also fixes a problematic callsite.
BUG=None
Review URL: https://codereview.chromium.org/1308753004
Cr-Commit-Position: refs/heads/master@{#344868}
Diffstat (limited to 'components/view_manager')
-rw-r--r-- | components/view_manager/gles2/command_buffer_driver.cc | 2 | ||||
-rw-r--r-- | components/view_manager/public/interfaces/command_buffer.mojom | 3 |
2 files changed, 3 insertions, 2 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); }; |