Index: components/display_compositor/host_shared_bitmap_manager.h |
diff --git a/content/common/host_shared_bitmap_manager.h b/components/display_compositor/host_shared_bitmap_manager.h |
similarity index 83% |
rename from content/common/host_shared_bitmap_manager.h |
rename to components/display_compositor/host_shared_bitmap_manager.h |
index d2abcd46d0a4d2c8cfdba11ff225fa1f6ee393fc..1e0e9a27b3030c996f6b3b205d783313a0910cbd 100644 |
--- a/content/common/host_shared_bitmap_manager.h |
+++ b/components/display_compositor/host_shared_bitmap_manager.h |
@@ -2,8 +2,8 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CONTENT_COMMON_HOST_SHARED_BITMAP_MANAGER_H_ |
-#define CONTENT_COMMON_HOST_SHARED_BITMAP_MANAGER_H_ |
+#ifndef COMPONENTS_DISPLAY_COMPOSITOR_HOST_SHARED_BITMAP_MANAGER_H_ |
+#define COMPONENTS_DISPLAY_COMPOSITOR_HOST_SHARED_BITMAP_MANAGER_H_ |
#include <stddef.h> |
@@ -19,7 +19,8 @@ |
#include "base/synchronization/lock.h" |
#include "base/trace_event/memory_dump_provider.h" |
#include "cc/resources/shared_bitmap_manager.h" |
-#include "content/common/content_export.h" |
+#include "components/display_compositor/display_compositor_export.h" |
+#include "components/display_compositor/interfaces/shared_bitmap_manager.mojom.h" |
namespace BASE_HASH_NAMESPACE { |
template <> |
@@ -30,16 +31,18 @@ struct hash<cc::SharedBitmapId> { |
}; |
} // namespace BASE_HASH_NAMESPACE |
-namespace content { |
+namespace display_compositor { |
class BitmapData; |
class HostSharedBitmapManager; |
-class CONTENT_EXPORT HostSharedBitmapManagerClient { |
+class DISPLAY_COMPOSITOR_EXPORT HostSharedBitmapManagerClient { |
public: |
explicit HostSharedBitmapManagerClient(HostSharedBitmapManager* manager); |
~HostSharedBitmapManagerClient(); |
+ void Bind(mojom::SharedBitmapManagerRequest request); |
+ |
void AllocateSharedBitmapForChild( |
base::ProcessHandle process_handle, |
size_t buffer_size, |
@@ -60,7 +63,7 @@ class CONTENT_EXPORT HostSharedBitmapManagerClient { |
DISALLOW_COPY_AND_ASSIGN(HostSharedBitmapManagerClient); |
}; |
-class CONTENT_EXPORT HostSharedBitmapManager |
+class DISPLAY_COMPOSITOR_EXPORT HostSharedBitmapManager |
: public cc::SharedBitmapManager, |
public base::trace_event::MemoryDumpProvider { |
public: |
@@ -99,13 +102,13 @@ class CONTENT_EXPORT HostSharedBitmapManager |
mutable base::Lock lock_; |
- typedef base::hash_map<cc::SharedBitmapId, scoped_refptr<BitmapData> > |
+ typedef base::hash_map<cc::SharedBitmapId, scoped_refptr<BitmapData>> |
BitmapMap; |
BitmapMap handle_map_; |
DISALLOW_COPY_AND_ASSIGN(HostSharedBitmapManager); |
}; |
-} // namespace content |
+} // namespace display_compositor |
-#endif // CONTENT_COMMON_HOST_SHARED_BITMAP_MANAGER_H_ |
+#endif // COMPONENTS_DISPLAY_COMPOSITOR_HOST_SHARED_BITMAP_MANAGER_H_ |