| Index: blimp/client/feature/compositor/blimp_compositor_manager.h
|
| diff --git a/blimp/client/feature/compositor/blimp_compositor_manager.h b/blimp/client/feature/compositor/blimp_compositor_manager.h
|
| index d4e1ec2177253864e8aa900f307892ecba823f47..d727b52e2b55ae3f0e7b4b4cfbdc5fb473d1f51c 100644
|
| --- a/blimp/client/feature/compositor/blimp_compositor_manager.h
|
| +++ b/blimp/client/feature/compositor/blimp_compositor_manager.h
|
| @@ -5,17 +5,18 @@
|
| #ifndef BLIMP_CLIENT_FEATURE_COMPOSITOR_BLIMP_COMPOSITOR_MANAGER_H_
|
| #define BLIMP_CLIENT_FEATURE_COMPOSITOR_BLIMP_COMPOSITOR_MANAGER_H_
|
|
|
| +#include <map>
|
| +
|
| #include "base/macros.h"
|
| #include "blimp/client/feature/compositor/blimp_compositor.h"
|
| #include "blimp/client/feature/compositor/blimp_gpu_memory_buffer_manager.h"
|
| +#include "blimp/client/feature/compositor/blob_image_serialization_processor.h"
|
| #include "blimp/client/feature/render_widget_feature.h"
|
| #include "cc/trees/layer_tree_settings.h"
|
|
|
| namespace blimp {
|
| namespace client {
|
|
|
| -class ClientImageSerializationProcessor;
|
| -
|
| class BlimpCompositorManagerClient {
|
| public:
|
| virtual void OnSwapBuffersCompleted() = 0;
|
| @@ -93,10 +94,6 @@ class BlimpCompositorManager
|
|
|
| std::unique_ptr<BlimpGpuMemoryBufferManager> gpu_memory_buffer_manager_;
|
|
|
| - // Provides the functionality to deserialize images in SkPicture.
|
| - std::unique_ptr<ClientImageSerializationProcessor>
|
| - image_serialization_processor_;
|
| -
|
| // A map of render_widget_ids to the BlimpCompositor instance.
|
| typedef std::map<int, std::unique_ptr<BlimpCompositor>> CompositorMap;
|
| CompositorMap compositors_;
|
|
|