Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(297)

Unified Diff: services/ui/surfaces/mus_display_provider.cc

Issue 2867173002: Install HostSharedBitmapManager to cc::Display created by MusDisplayProvider (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/surfaces/mus_display_provider.cc
diff --git a/services/ui/surfaces/mus_display_provider.cc b/services/ui/surfaces/mus_display_provider.cc
index 30be7d10fa0f24f2c5e22dc92d76fa5d5132081a..3af48532c5dc5e881ba0de421d6797b01797ece4 100644
--- a/services/ui/surfaces/mus_display_provider.cc
+++ b/services/ui/surfaces/mus_display_provider.cc
@@ -15,6 +15,7 @@
#include "cc/scheduler/begin_frame_source.h"
#include "cc/surfaces/display.h"
#include "cc/surfaces/display_scheduler.h"
+#include "components/display_compositor/host_shared_bitmap_manager.h"
#include "gpu/command_buffer/client/shared_memory_limits.h"
#include "gpu/command_buffer/service/image_factory.h"
#include "services/ui/surfaces/display_output_surface.h"
@@ -85,9 +86,10 @@ std::unique_ptr<cc::Display> MusDisplayProvider::CreateDisplay(
*begin_frame_source = std::move(synthetic_begin_frame_source);
return base::MakeUnique<cc::Display>(
- nullptr /* bitmap_manager */, gpu_memory_buffer_manager_.get(), settings,
- frame_sink_id, begin_frame_source->get(),
- std::move(display_output_surface), std::move(scheduler),
+ display_compositor::HostSharedBitmapManager::current(),
+ gpu_memory_buffer_manager_.get(), settings, frame_sink_id,
+ begin_frame_source->get(), std::move(display_output_surface),
+ std::move(scheduler),
base::MakeUnique<cc::TextureMailboxDeleter>(task_runner_.get()));
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698