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

Unified Diff: content/browser/compositor/test/no_transport_image_transport_factory.cc

Issue 2830143002: Add FrameSinkManagerHost to NoTransportImageTransportFactory. (Closed)
Patch Set: Also android. Created 3 years, 8 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
Index: content/browser/compositor/test/no_transport_image_transport_factory.cc
diff --git a/content/browser/compositor/test/no_transport_image_transport_factory.cc b/content/browser/compositor/test/no_transport_image_transport_factory.cc
index f326a4b2254be138cbe5d7b9f948baa5db93d284..51a042331ea634c63760df2f1d127e42058559b4 100644
--- a/content/browser/compositor/test/no_transport_image_transport_factory.cc
+++ b/content/browser/compositor/test/no_transport_image_transport_factory.cc
@@ -6,6 +6,7 @@
#include <utility>
+#include "base/memory/ptr_util.h"
#include "build/build_config.h"
#include "cc/output/context_provider.h"
#include "cc/surfaces/surface_manager.h"
@@ -17,11 +18,12 @@
namespace content {
NoTransportImageTransportFactory::NoTransportImageTransportFactory()
- : surface_manager_(new cc::SurfaceManager),
+ : frame_sink_manager_host_(base::MakeUnique<FrameSinkManagerHost>()),
// The context factory created here is for unit tests, thus passing in
// true in constructor.
- context_factory_(
- new ui::InProcessContextFactory(true, surface_manager_.get())) {}
+ context_factory_(base::MakeUnique<ui::InProcessContextFactory>(
+ true,
+ frame_sink_manager_host_->surface_manager())) {}
NoTransportImageTransportFactory::~NoTransportImageTransportFactory() {
std::unique_ptr<display_compositor::GLHelper> lost_gl_helper =
@@ -40,8 +42,7 @@ NoTransportImageTransportFactory::GetContextFactoryPrivate() {
FrameSinkManagerHost*
NoTransportImageTransportFactory::GetFrameSinkManagerHost() {
- NOTIMPLEMENTED();
- return nullptr;
+ return frame_sink_manager_host_.get();
}
display_compositor::GLHelper* NoTransportImageTransportFactory::GetGLHelper() {

Powered by Google App Engine
This is Rietveld 408576698