| Index: content/common/gpu/gpu_command_buffer_stub.h
|
| diff --git a/content/common/gpu/gpu_command_buffer_stub.h b/content/common/gpu/gpu_command_buffer_stub.h
|
| index a74ab64c384f54cb6f141bd0157298acbf8acfee..0a3fdbae26a7bc577c08a3498e6d3d29995a4093 100644
|
| --- a/content/common/gpu/gpu_command_buffer_stub.h
|
| +++ b/content/common/gpu/gpu_command_buffer_stub.h
|
| @@ -18,6 +18,7 @@
|
| #include "base/time/time.h"
|
| #include "content/common/content_export.h"
|
| #include "content/common/gpu/gpu_memory_manager.h"
|
| +#include "gpu/command_buffer/common/command_buffer_id.h"
|
| #include "gpu/command_buffer/common/constants.h"
|
| #include "gpu/command_buffer/common/gpu_memory_allocation.h"
|
| #include "gpu/command_buffer/service/command_buffer_service.h"
|
| @@ -115,7 +116,7 @@ class GpuCommandBufferStub
|
| GpuChannel* channel() const { return channel_; }
|
|
|
| // Unique command buffer ID for this command buffer stub.
|
| - uint64_t command_buffer_id() const { return command_buffer_id_; }
|
| + gpu::CommandBufferId command_buffer_id() const { return command_buffer_id_; }
|
|
|
| // Identifies the various GpuCommandBufferStubs in the GPU process belonging
|
| // to the same renderer process.
|
| @@ -199,10 +200,10 @@ class GpuCommandBufferStub
|
|
|
| void OnFenceSyncRelease(uint64_t release);
|
| bool OnWaitFenceSync(gpu::CommandBufferNamespace namespace_id,
|
| - uint64_t command_buffer_id,
|
| + gpu::CommandBufferId command_buffer_id,
|
| uint64_t release);
|
| void OnWaitFenceSyncCompleted(gpu::CommandBufferNamespace namespace_id,
|
| - uint64_t command_buffer_id,
|
| + gpu::CommandBufferId command_buffer_id,
|
| uint64_t release);
|
|
|
| void OnCreateImage(const GpuCommandBufferMsg_CreateImage_Params& params);
|
| @@ -233,7 +234,7 @@ class GpuCommandBufferStub
|
| bool CheckContextLost();
|
| void CheckCompleteWaits();
|
| void PullTextureUpdates(gpu::CommandBufferNamespace namespace_id,
|
| - uint64_t command_buffer_id,
|
| + gpu::CommandBufferId command_buffer_id,
|
| uint32_t release);
|
|
|
| // The lifetime of objects of this class is managed by a GpuChannel. The
|
| @@ -257,7 +258,7 @@ class GpuCommandBufferStub
|
| std::vector<int32_t> requested_attribs_;
|
| gfx::GpuPreference gpu_preference_;
|
| bool use_virtualized_gl_context_;
|
| - const uint64_t command_buffer_id_;
|
| + const gpu::CommandBufferId command_buffer_id_;
|
| const int32_t stream_id_;
|
| const int32_t route_id_;
|
| const bool offscreen_;
|
|
|