| Index: gpu/ipc/client/gpu_channel_host.h
|
| diff --git a/gpu/ipc/client/gpu_channel_host.h b/gpu/ipc/client/gpu_channel_host.h
|
| index 88733e799919a9d2875f86530b20b8345adb3396..1233156ecad586397edf45d6daadbbdaaaf0a917 100644
|
| --- a/gpu/ipc/client/gpu_channel_host.h
|
| +++ b/gpu/ipc/client/gpu_channel_host.h
|
| @@ -18,9 +18,9 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/process/process.h"
|
| #include "base/synchronization/lock.h"
|
| +#include "gpu/command_buffer/common/gpu_stream_constants.h"
|
| #include "gpu/config/gpu_info.h"
|
| #include "gpu/gpu_export.h"
|
| -#include "gpu/ipc/common/gpu_stream_constants.h"
|
| #include "ipc/ipc_channel_handle.h"
|
| #include "ipc/ipc_sync_channel.h"
|
| #include "ipc/message_filter.h"
|
| @@ -150,9 +150,6 @@ class GPU_EXPORT GpuChannelHost
|
| // Generate a route ID guaranteed to be unique for this channel.
|
| int32_t GenerateRouteID();
|
|
|
| - // Generate a stream ID guaranteed to be unique for this channel.
|
| - int32_t GenerateStreamID();
|
| -
|
| // Sends a synchronous nop to the server which validate that all previous IPC
|
| // messages have been received. Once the synchronous nop has been sent to the
|
| // server all previous flushes will all be marked as validated, including
|
| @@ -250,7 +247,6 @@ class GPU_EXPORT GpuChannelHost
|
| // except:
|
| // - |next_image_id_|, atomic type
|
| // - |next_route_id_|, atomic type
|
| - // - |next_stream_id_|, atomic type
|
| // - |channel_| and |stream_flush_info_|, protected by |context_lock_|
|
| GpuChannelHostFactory* const factory_;
|
|
|
| @@ -270,9 +266,6 @@ class GPU_EXPORT GpuChannelHost
|
| // Route IDs are allocated in sequence.
|
| base::AtomicSequenceNumber next_route_id_;
|
|
|
| - // Stream IDs are allocated in sequence.
|
| - base::AtomicSequenceNumber next_stream_id_;
|
| -
|
| // Protects channel_ and stream_flush_info_.
|
| mutable base::Lock context_lock_;
|
| std::unique_ptr<IPC::SyncChannel> channel_;
|
|
|