| Index: gpu/command_buffer/service/texture_manager.h
|
| diff --git a/gpu/command_buffer/service/texture_manager.h b/gpu/command_buffer/service/texture_manager.h
|
| index f0d3185eceb7079141660441c69b4b8d83c754e7..6835b86064c4bfd8f167b024e86fd07055cdb8a8 100644
|
| --- a/gpu/command_buffer/service/texture_manager.h
|
| +++ b/gpu/command_buffer/service/texture_manager.h
|
| @@ -38,6 +38,7 @@ class ErrorState;
|
| class FeatureInfo;
|
| class FramebufferManager;
|
| class MailboxManager;
|
| +class ProgressReporter;
|
| class Texture;
|
| class TextureManager;
|
| class TextureRef;
|
| @@ -765,7 +766,8 @@ class GPU_EXPORT TextureManager : public base::trace_event::MemoryDumpProvider {
|
| GLsizei max_rectangle_texture_size,
|
| GLsizei max_3d_texture_size,
|
| GLsizei max_array_texture_layers,
|
| - bool use_default_textures);
|
| + bool use_default_textures,
|
| + ProgressReporter* progress_reporter);
|
| ~TextureManager() override;
|
|
|
| void set_framebuffer_manager(FramebufferManager* manager) {
|
| @@ -1235,6 +1237,10 @@ class GPU_EXPORT TextureManager : public base::trace_event::MemoryDumpProvider {
|
|
|
| uint32_t current_service_id_generation_;
|
|
|
| + // Used to notify the watchdog thread of progress during destruction,
|
| + // preventing time-outs when destruction takes a long time.
|
| + ProgressReporter* progress_reporter_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(TextureManager);
|
| };
|
|
|
|
|