| Index: content/public/gpu/content_gpu_client.h
|
| diff --git a/content/public/gpu/content_gpu_client.h b/content/public/gpu/content_gpu_client.h
|
| index ed348127eb9dafb3dc4bd1e7c9ca01ea51265e3d..e3126e8bda1ad10dbb48d4b974281773bcb08da8 100644
|
| --- a/content/public/gpu/content_gpu_client.h
|
| +++ b/content/public/gpu/content_gpu_client.h
|
| @@ -14,8 +14,7 @@ struct GpuPreferences;
|
| }
|
|
|
| namespace service_manager {
|
| -class Connector;
|
| -class InterfaceRegistry;
|
| +class BinderRegistry;
|
| }
|
|
|
| namespace content {
|
| @@ -28,18 +27,19 @@ class CONTENT_EXPORT ContentGpuClient {
|
| // Initializes the client. This sets up the field trial synchronization
|
| // mechanism, which will notify |observer| when a field trial is activated,
|
| // which should be used to inform the browser process of this state.
|
| - virtual void Initialize(base::FieldTrialList::Observer* observer) {}
|
| -
|
| - // Allows the client to expose interfaces from the GPU process to the browser
|
| - // process via |registry|.
|
| - virtual void ExposeInterfacesToBrowser(
|
| - service_manager::InterfaceRegistry* registry,
|
| + // |registry| will be passed to a ConnectionFilter (which lives on the IO
|
| + // thread). Unlike other childthreads, the client must register additional
|
| + // interfaces on this registry rather than just creating more
|
| + // ConnectionFilters as the ConnectionFilter that wraps this registry
|
| + // specifically does not bind any interface requests until after the Gpu
|
| + // process receives CreateGpuService() from the browser.
|
| + virtual void Initialize(base::FieldTrialList::Observer* observer,
|
| + service_manager::BinderRegistry* registry) {}
|
| +
|
| + // Called during initialization once the GpuService has been initialized.
|
| + virtual void GpuServiceInitialized(
|
| const gpu::GpuPreferences& gpu_preferences) {}
|
|
|
| - // Allow the client to bind interfaces exposed by the browser process.
|
| - virtual void ConsumeInterfacesFromBrowser(
|
| - service_manager::Connector* connector) {}
|
| -
|
| // Allows client to supply a SyncPointManager instance instead of having
|
| // content internally create one.
|
| virtual gpu::SyncPointManager* GetSyncPointManager();
|
|
|