| Index: components/display_compositor/buffer_queue.h
|
| diff --git a/components/display_compositor/buffer_queue.h b/components/display_compositor/buffer_queue.h
|
| index f862b88534b44d730cad1a622867863bfc4bfb84..e0a24848e214929f9c7d0ac734b42e1ee58dbcfd 100644
|
| --- a/components/display_compositor/buffer_queue.h
|
| +++ b/components/display_compositor/buffer_queue.h
|
| @@ -41,8 +41,8 @@ class GLHelper;
|
| class DISPLAY_COMPOSITOR_EXPORT BufferQueue {
|
| public:
|
| BufferQueue(gpu::gles2::GLES2Interface* gl,
|
| - unsigned int texture_target,
|
| - unsigned int internalformat,
|
| + uint32_t texture_target,
|
| + uint32_t internal_format,
|
| GLHelper* gl_helper,
|
| gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
|
| gpu::SurfaceHandle surface_handle);
|
| @@ -57,10 +57,11 @@ class DISPLAY_COMPOSITOR_EXPORT BufferQueue {
|
|
|
| void RecreateBuffers();
|
|
|
| - unsigned int current_texture_id() const {
|
| + uint32_t current_texture_id() const {
|
| return current_surface_ ? current_surface_->texture : 0;
|
| }
|
| - unsigned int fbo() const { return fbo_; }
|
| + uint32_t fbo() const { return fbo_; }
|
| + uint32_t internal_format() const { return internal_format_; }
|
|
|
| private:
|
| friend class BufferQueueTest;
|
| @@ -69,14 +70,14 @@ class DISPLAY_COMPOSITOR_EXPORT BufferQueue {
|
| struct DISPLAY_COMPOSITOR_EXPORT AllocatedSurface {
|
| AllocatedSurface(BufferQueue* buffer_queue,
|
| std::unique_ptr<gfx::GpuMemoryBuffer> buffer,
|
| - unsigned int texture,
|
| - unsigned int image,
|
| + uint32_t texture,
|
| + uint32_t image,
|
| const gfx::Rect& rect);
|
| ~AllocatedSurface();
|
| BufferQueue* const buffer_queue;
|
| std::unique_ptr<gfx::GpuMemoryBuffer> buffer;
|
| - const unsigned int texture;
|
| - const unsigned int image;
|
| + const uint32_t texture;
|
| + const uint32_t image;
|
| gfx::Rect damage; // This is the damage for this frame from the previous.
|
| };
|
|
|
| @@ -101,10 +102,10 @@ class DISPLAY_COMPOSITOR_EXPORT BufferQueue {
|
|
|
| gpu::gles2::GLES2Interface* const gl_;
|
| gfx::Size size_;
|
| - unsigned int fbo_;
|
| + uint32_t fbo_;
|
| size_t allocated_count_;
|
| - unsigned int texture_target_;
|
| - unsigned int internal_format_;
|
| + uint32_t texture_target_;
|
| + uint32_t internal_format_;
|
| // This surface is currently bound. This may be nullptr if no surface has
|
| // been bound, or if allocation failed at bind.
|
| std::unique_ptr<AllocatedSurface> current_surface_;
|
|
|