| Index: content/browser/renderer_host/render_message_filter.h
|
| diff --git a/content/browser/renderer_host/render_message_filter.h b/content/browser/renderer_host/render_message_filter.h
|
| index d025771ecb74307520c713d6e768af936eca15d1..55de0db1343c9b3b427f9e29ae62e626951245ca 100644
|
| --- a/content/browser/renderer_host/render_message_filter.h
|
| +++ b/content/browser/renderer_host/render_message_filter.h
|
| @@ -20,8 +20,8 @@
|
| #include "base/strings/string16.h"
|
| #include "build/build_config.h"
|
| #include "cc/resources/shared_bitmap_manager.h"
|
| +#include "components/display_compositor/host_shared_bitmap_manager.h"
|
| #include "content/common/cache_storage/cache_storage_types.h"
|
| -#include "content/common/host_shared_bitmap_manager.h"
|
| #include "content/common/render_message_filter.mojom.h"
|
| #include "content/public/browser/browser_associated_interface.h"
|
| #include "content/public/browser/browser_message_filter.h"
|
| @@ -120,9 +120,8 @@ class CONTENT_EXPORT RenderMessageFilter
|
| void CreateFullscreenWidget(
|
| int opener_id,
|
| const CreateFullscreenWidgetCallback& callback) override;
|
| - void AllocatedSharedBitmap(mojo::ScopedSharedBufferHandle buffer,
|
| - const cc::SharedBitmapId& id) override;
|
| - void DeletedSharedBitmap(const cc::SharedBitmapId& id) override;
|
| + void GetSharedBitmapManager(
|
| + cc::mojom::SharedBitmapManagerAssociatedRequest request) override;
|
|
|
| // Message handlers called on the browser IO thread:
|
| void OnHasGpuProcess(IPC::Message* reply);
|
| @@ -165,7 +164,7 @@ class CONTENT_EXPORT RenderMessageFilter
|
| // than we do.
|
| ResourceDispatcherHostImpl* resource_dispatcher_host_;
|
|
|
| - HostSharedBitmapManagerClient bitmap_manager_client_;
|
| + display_compositor::HostSharedBitmapManagerClient bitmap_manager_client_;
|
|
|
| // Contextual information to be used for requests created here.
|
| scoped_refptr<net::URLRequestContextGetter> request_context_;
|
|
|